hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-895] Advanced Embargo Project : Fix JUnit Tests and Correct Database Schema

Browse Source
This commit is contained in:
Fabio Bolognesi
2012-08-20 16:24:13 -07:00
parent 435e11bd23
commit 4d09619dbb
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dspace-api/src/main/java/org/dspace/authorize/AuthorizeManager.java
View File

@@ -295,17 +295,6 @@ public class AuthorizeManager
} }
} }
if (o instanceof Item)
{
Item i = (Item) o;
if (!i.isArchived()) return false;
if (i.isWithdrawn()) return false;
if (!i.isDiscoverable()) return false;
}
for (ResourcePolicy rp : getPoliciesActionFilter(c, o, action)) for (ResourcePolicy rp : getPoliciesActionFilter(c, o, action))
{ {
// check policies for date validity // check policies for date validity

6
dspace-api/src/test/resources/database_schema.sql
View File

@@ -241,6 +241,7 @@ CREATE TABLE Item
submitter_id INTEGER REFERENCES EPerson(eperson_id), submitter_id INTEGER REFERENCES EPerson(eperson_id),
in_archive BOOL, in_archive BOOL,
withdrawn BOOL, withdrawn BOOL,
discoverable BOOL,
last_modified TIMESTAMP, last_modified TIMESTAMP,
owning_collection INTEGER owning_collection INTEGER
); );
@@ -444,7 +445,10 @@ CREATE TABLE ResourcePolicy
eperson_id INTEGER REFERENCES EPerson(eperson_id), eperson_id INTEGER REFERENCES EPerson(eperson_id),
epersongroup_id INTEGER REFERENCES EPersonGroup(eperson_group_id), epersongroup_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
start_date DATE, start_date DATE,
end_date DATE end_date DATE,
rpname VARCHAR(30),
rptype VARCHAR(30),
rpdescription VARCHAR(100)
); );
-- index by resource_type,resource_id - all queries by -- index by resource_type,resource_id - all queries by

6
dspace/etc/h2/database_schema.sql
View File

@@ -241,6 +241,7 @@ CREATE TABLE Item
submitter_id INTEGER REFERENCES EPerson(eperson_id), submitter_id INTEGER REFERENCES EPerson(eperson_id),
in_archive BOOL, in_archive BOOL,
withdrawn BOOL, withdrawn BOOL,
discoverable BOOL,
last_modified TIMESTAMP, last_modified TIMESTAMP,
owning_collection INTEGER owning_collection INTEGER
); );
@@ -444,7 +445,10 @@ CREATE TABLE ResourcePolicy
eperson_id INTEGER REFERENCES EPerson(eperson_id), eperson_id INTEGER REFERENCES EPerson(eperson_id),
epersongroup_id INTEGER REFERENCES EPersonGroup(eperson_group_id), epersongroup_id INTEGER REFERENCES EPersonGroup(eperson_group_id),
start_date DATE, start_date DATE,
end_date DATE end_date DATE,
rpname VARCHAR(30),
rptype VARCHAR(30),
rpdescription VARCHAR(100)
); );
-- index by resource_type,resource_id - all queries by -- index by resource_type,resource_id - all queries by

4
dspace/etc/oracle/database_schema.sql
View File

@@ -404,8 +404,8 @@ CREATE TABLE ResourcePolicy
start_date DATE, start_date DATE,
end_date DATE, end_date DATE,
rpname VARCHAR2(30), rpname VARCHAR2(30),
rpdescription VARCHAR2(100), rptype VARCHAR2(30),
rptype VARCHAR2(30); rpdescription VARCHAR2(100)
); );
-- index by resource_type,resource_id - all queries by -- index by resource_type,resource_id - all queries by

4
dspace/etc/oracle/database_schema_18-3.sql
View File

@@ -24,8 +24,8 @@
ALTER TABLE resourcepolicy ALTER TABLE resourcepolicy
ADD ( ADD (
rpname VARCHAR2(30); rpname VARCHAR2(30);
rpdescription VARCHAR2(100); rptype VARCHAR2(30);
rptype VARCHAR2(30) rpdescription VARCHAR2(100)
); );

6
pom.xml
View File

@@ -72,6 +72,10 @@
<excludes> <excludes>
<exclude>**/Abstract*</exclude> <exclude>**/Abstract*</exclude>
</excludes> </excludes>
<!--
Enable to debug Maven Surefire tests in remote proces
<debugForkedProcess>true</debugForkedProcess>
-->
<!-- required when running JMockit under Java 1.5 --> <!-- required when running JMockit under Java 1.5 -->
<argLine>-javaagent:"${settings.localRepository}"/org/dspace/dependencies/jmockit/dspace-jmockit/0.999.4/dspace-jmockit-0.999.4.jar</argLine> <argLine>-javaagent:"${settings.localRepository}"/org/dspace/dependencies/jmockit/dspace-jmockit/0.999.4/dspace-jmockit-0.999.4.jar</argLine>
</configuration> </configuration>
@@ -390,7 +394,7 @@
<profile> <profile>
<id>skiptests</id> <id>skiptests</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<properties> <properties>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>