Fedora Commons Code

Brought to you by: aawoods, ajs6f, arrang, barmintor, and 13 others

Commit [r8822] Maximize Restore History

Merged the changes that went into 3.4.1 release (FCREPO-798 fix, in the branch) into trunk,

but kept version 3.5-SNAPSHOT as the version in the poms, and disabled the APIM2-related
tests until the test data for fcrepo-798 is made publicly available.

Authored by: cwilper 2010-10-25

Browse code at this revision

Parent: [r8821]

Child: [r8823]

copied	/fedora/branches/fcrepo-798/fcrepo-integrationtest/src/test/java/org/fcrepo/test/TemplatedResourceIterator.java -> /fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/TemplatedResourceIterator.java
copied	/fedora/branches/fcrepo-798/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestAPIM2.java -> /fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestAPIM2.java
changed	/fedora/trunk/fcrepo-integrationtest/pom.xml
changed	/fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/AllSystemTestsConfigA.java
changed	/fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestRESTAPI.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/management/DBPIDGenerator.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/Condition.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/FieldSearchResultSQLImpl.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/FieldSearchSQLImpl.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/ConnectionPool.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/DefaultDOManager.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/lowlevel/DBPathRegistry.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/types/Datastream.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/SQLUtility.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/SQLUtilityImpl.java
changed	/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/rebuild/SQLRebuilder.java
changed	/fedora/trunk/fcrepo-server/src/main/resources/dbspec/server/org/fcrepo/server/storage/resources/DefaultDOManager.dbspec
changed	/fedora/trunk/fcrepo-server/src/test/java/org/fcrepo/mock/sql/MockConnection.java
changed	/fedora/trunk/fcrepo-server/src/test/java/org/fcrepo/server/search/FieldSearchSQLImplIntegrationTest.java
changed	/fedora/trunk/fcrepo-server/src/test/java/org/fcrepo/server/utilities/DerbyDDLConverterIntegrationTest.java

/fedora/branches/fcrepo-798/fcrepo-integrationtest/src/test/java/org/fcrepo/test/TemplatedResourceIterator.java to /fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/TemplatedResourceIterator.java

File was copied.

/fedora/branches/fcrepo-798/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestAPIM2.java to /fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestAPIM2.java

File was copied.

/fedora/trunk/fcrepo-integrationtest/pom.xml Diff Switch to side-by-side view

/fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/AllSystemTestsConfigA.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-integrationtest/src/test/java/org/fcrepo/test/api/TestRESTAPI.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/management/DBPIDGenerator.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/Condition.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/FieldSearchResultSQLImpl.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/search/FieldSearchSQLImpl.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/ConnectionPool.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/DefaultDOManager.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/lowlevel/DBPathRegistry.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/storage/types/Datastream.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/SQLUtility.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/SQLUtilityImpl.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/java/org/fcrepo/server/utilities/rebuild/SQLRebuilder.java Diff Switch to side-by-side view

/fedora/trunk/fcrepo-server/src/main/resources/dbspec/server/org/fcrepo/server/storage/resources/DefaultDOManager.dbspec Diff Switch to side-by-side view