]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
CSPACE-4979: Merge of multi-repo work with master branch.
authorRichard Millet <remillet@berkeley.edu>
Fri, 14 Dec 2012 17:56:07 +0000 (09:56 -0800)
committerRichard Millet <remillet@berkeley.edu>
Fri, 14 Dec 2012 17:56:07 +0000 (09:56 -0800)
commit11d95c48c25e94c080f080da00cc1528447ace1c
tree2853ea5a8c8a182ff2006ffae36cf7c5e6c8aad1
parent08e062aab7a5a3d06f4428f67c20a3123c59756b
CSPACE-4979: Merge of multi-repo work with master branch.
288 files changed:
.gitignore
.project
.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/.project
3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/nuxeo/.project
3rdparty/nuxeo/.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/nuxeo/nuxeo-platform-collectionspace/.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
3rdparty/nuxeo/nuxeo-platform-quote-api/.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/nuxeo/nuxeo-platform-quote/.settings/org.maven.ide.eclipse.prefs [deleted file]
3rdparty/nuxeo/nuxeo-server/5.5-HF07/config/lifesci-domain-repo-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/5.5/config/lifesci-domain-repo-config.xml [new file with mode: 0644]
3rdparty/pom.xml
pom.xml
services/.project
services/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/IntegrationTests/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/JaxRsServiceProvider/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/JaxRsServiceProvider/src/main/resources/log4j.properties
services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
services/PerformanceTests/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/account/.project
services/account/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/account/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/account/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/account/pstore/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/account/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/.project
services/acquisition/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/3rdparty/.project
services/acquisition/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/acquisition/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authentication/.project
services/authentication/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authentication/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authentication/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authentication/pstore/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authentication/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization-mgt/.project
services/authorization-mgt/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization-mgt/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization-mgt/import/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization-mgt/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization/.project
services/authorization/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization/pstore/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/authorization/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/batch/.project
services/batch/3rdparty/.project
services/batch/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/batch/3rdparty/nuxeo-platform-cs-batch/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/batch/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/batch/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/batch/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/.project
services/blob/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/3rdparty/.project
services/blob/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/3rdparty/nuxeo-platform-cs-blob/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/jaxb/.project [deleted file]
services/blob/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/blob/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java
services/collectionobject/.project
services/collectionobject/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/collectionobject/3rdparty/.project
services/collectionobject/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/collectionobject/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/collectionobject/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/collectionobject/sample/.project
services/collectionobject/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/collectionobject/sample/sample/.project
services/collectionobject/sample/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/common-test/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/common/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/common/pom.xml
services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/authorization_mgt/AuthorizationCommon.java
services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java
services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java
services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java
services/common/src/main/java/org/collectionspace/services/common/init/IInitHandler.java
services/common/src/main/java/org/collectionspace/services/common/init/InitHandler.java
services/common/src/main/java/org/collectionspace/services/common/init/ModifyFieldDatatypes.java
services/common/src/main/java/org/collectionspace/services/common/init/RunSqlScript.java [new file with mode: 0644]
services/common/src/main/java/org/collectionspace/services/common/query/QueryManager.java
services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java
services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClient.java
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoClientEmbedded.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoConnectorEmbedded.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/TenantRepository.java
services/common/src/main/resources/db/mysql/create_id_generators_table.sql [new file with mode: 0644]
services/common/src/main/resources/db/mysql/load_id_generators.sql [new file with mode: 0644]
services/common/src/main/resources/db/postgresql/create_id_generators_table.sql [new file with mode: 0644]
services/common/src/main/resources/db/postgresql/load_id_generators.sql [new file with mode: 0644]
services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java [new file with mode: 0644]
services/config/src/main/resources/tenant.xsd
services/contact/.project
services/contact/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/contact/3rdparty/.project
services/contact/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/contact/3rdparty/nuxeo-platform-cs-contact/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/contact/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/contact/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/contact/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/.project
services/dimension/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/3rdparty/.project
services/dimension/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/3rdparty/nuxeo-platform-cs-dimension/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/dimension/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/.project
services/group/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/3rdparty/.project
services/group/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/3rdparty/nuxeo-platform-cs-group/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/group/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/hyperjaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/.project
services/id/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/3rdparty/.project [deleted file]
services/id/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/3rdparty/nuxeo-platform-cs-id/.project [deleted file]
services/id/3rdparty/nuxeo-platform-cs-id/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/client/pom.xml
services/id/client/src/main/java/org/collectionspace/services/client/IdClient.java
services/id/jaxb/.project [deleted file]
services/id/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/id/service/build.xml
services/id/service/pom.xml
services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
services/id/service/src/test/java/org/collectionspace/services/id/IdServiceTest.java [moved from services/id/client/src/test/java/org/collectionspace/services/client/test/IdServiceTest.java with 97% similarity]
services/imports/.project
services/imports/3rdparty/.project
services/imports/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/imports/3rdparty/nuxeo-platform-cs-imports/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/imports/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/imports/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/.project
services/intake/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/3rdparty/.project
services/intake/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/intake/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/.project
services/loanin/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/3rdparty/.project
services/loanin/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/3rdparty/nuxeo-platform-cs-loanin/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanin/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/.project
services/loanout/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/3rdparty/.project
services/loanout/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/3rdparty/nuxeo-platform-cs-loanout/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/loanout/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/.project
services/location/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/3rdparty/.project
services/location/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/3rdparty/nuxeo-platform-cs-location/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/location/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/.project
services/media/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/3rdparty/.project
services/media/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/3rdparty/nuxeo-platform-cs-media/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/media/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/.project
services/movement/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/3rdparty/.project
services/movement/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/3rdparty/nuxeo-platform-cs-movement/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/movement/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/.project
services/note/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/3rdparty/.project
services/note/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/3rdparty/nuxeo-platform-cs-note/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/note/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/objectexit/.project
services/objectexit/3rdparty/.project
services/objectexit/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/objectexit/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/objectexit/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/objectexit/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/.project
services/organization/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/3rdparty/.project
services/organization/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/3rdparty/nuxeo-platform-cs-organization/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/sample/.project
services/organization/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/sample/sample/.project
services/organization/sample/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/organization/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/.project
services/person/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/3rdparty/.project
services/person/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/3rdparty/nuxeo-platform-cs-person/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/sample/.project
services/person/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/sample/sample/.project
services/person/sample/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/person/sample/sample/pom.xml
services/person/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/query/.project
services/query/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/query/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/relation/.project
services/relation/3rdparty/.project
services/relation/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/relation/3rdparty/nuxeo-platform-cs-relation/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/relation/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/relation/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/.project
services/report/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/3rdparty/.project
services/report/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/3rdparty/nuxeo-platform-cs-report/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/service/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/report/service/src/main/java/org/collectionspace/services/report/ReportResource.java
services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportPostInitHandler.java
services/sdk/.project [deleted file]
services/sdk/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/sdk/sample/.project [deleted file]
services/sdk/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/security/.project
services/security/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/security/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/.project
services/vocabulary/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/3rdparty/.project
services/vocabulary/3rdparty/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/client/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/jaxb/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/sample/.project
services/vocabulary/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/sample/sample/.project
services/vocabulary/sample/sample/.settings/org.maven.ide.eclipse.prefs [deleted file]
services/vocabulary/service/.settings/org.maven.ide.eclipse.prefs [deleted file]