]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
DRYD-630: Upgrade nuxeo to 9.10-HF30.
authorRay Lee <ray.lee@lyrasis.org>
Thu, 18 Apr 2019 01:31:13 +0000 (18:31 -0700)
committerRay Lee <ray.lee@lyrasis.org>
Thu, 25 Apr 2019 20:23:37 +0000 (13:23 -0700)
488 files changed:
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java
3rdparty/nuxeo/nuxeo-platform-listener/botgarden/pom.xml
3rdparty/nuxeo/nuxeo-platform-listener/naturalhistory/pom.xml
3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml
3rdparty/nuxeo/nuxeo-platform-thumbnail/pom.xml
3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-elasticsearch-config.xml
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/README.txt [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-core-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-io-9.10-HF03.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-common-9.10-HF25.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-api-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-common-9.10-HF20.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-s3-9.10-HF26.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-cache-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-9.10-HF29.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-plugins-9.10-HF29.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-el-9.10-HF24.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-event-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-io-9.10-HF27.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-9.10-HF02.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-jtajca-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-mimetype-9.10-HF19.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-persistence-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-query-9.10-HF18.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-redis-9.10-HF01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-schema-9.10-HF10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-9.10-HF27.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-dbs-9.10-HF19.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-mongodb-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-management-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-dmk-adaptor-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-elasticsearch-core-9.10-HF29.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-core-9.10-HF23.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-jaxrs-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-stream-9.10-HF04.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-invite-9.10-HF29.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-launcher-commons-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-bindings-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-impl-9.10-HF09.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-actions-core-9.10-HF08.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-commandline-executor-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-default-config-9.10-HF09.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-dublincore-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-api-9.10-HF07.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-9.10-HF01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-listener-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-htmlsanitizer-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-convert-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-core-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-core-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-9.10-HF16.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-ext-9.10-HF01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-9.10-HF03.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-default-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-digest-9.10-HF01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-token-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-oauth-9.10-HF29.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-query-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-relations-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-rendition-core-9.10-HF25.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-search-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-core-9.10-HF27.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-core-9.10-HF26.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-uidgen-core-9.10-HF02.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-core-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-api-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-core-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-9.10-HF23.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-datasource-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-deploy-9.10-HF14.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-jtajca-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-kv-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-management-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-metrics-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-migration-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-osgi-9.10-HF04.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-reload-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/convert-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/elasticsearch-classreplacer-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/login-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo-container.properties [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-datasource-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-repo-config.xml [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/s3binarymanager.properties [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/vcsconfig.sql.txt [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/launcher.properties [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/HdrHistogram-2.1.9.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/README.txt [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/activation-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/affinity-3.1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aggs-matrix-stats-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/annotations-12.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-1.7.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-launcher-1.7.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antisamy-1.5.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-2.7.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-runtime-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aopalliance-1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-bootstrap-extract-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-btree-base-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-constants-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-shared-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-jdbm-store-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-kerberos-shared-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-protocol-shared-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-bootstrap-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-registries-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-utils-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/arq-2.8.8.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/asm-5.0.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-constants-1.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-css-1.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-i18n-1.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-util-1.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/c3p0-0.9.1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-api-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-bindings-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-impl-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-api-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-impl-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-bindings-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-support-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-bytes-1.9.18.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-core-1.9.19.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-queue-4.6.44.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-threads-1.9.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-wire-1.9.34.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-beanutils-1.9.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-cli-1.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-codec-1.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections-3.2.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections4-4.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-csv-1.5.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-dbcp-1.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-digester-2.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-fileupload-1.3.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-io-2.5.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-jexl-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool-1.5.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool2-2.4.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-text-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-validator-1.5.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/compiler-0.9.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/connector-api-1.5.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/core-1.0-b02.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cors-filter-2.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/curvesapi-1.04.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-core-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-soap-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-xml-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-databinding-jaxb-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-jaxws-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-simple-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-transports-http-3.1.3-NX2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-addr-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-policy-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-wsdl-3.1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/dom4j-1.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ehcache-core-2.5.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-high-level-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/expiringmap-0.5.8.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ezmorph-1.0.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/failsafe-1.0.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/flute-1.3.0.gg2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/fontbox-1.8.16.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-connector-2.2.1-NX1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-transaction-2.2.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-1.19.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-jackson-1.19.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-oauth-client-1.20.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/groovy-all-2.4.12.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guava-18.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guice-3.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-annotations-3.4.0.GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-commons-annotations-3.1.0.GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-core-3.3.2.GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-entitymanager-3.4.0.GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/howl-1.0.1-1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hppc-0.7.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hsqldb-1.8.0.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpasyncclient-4.1.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpclient-4.5.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-4.4.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-nio-4.4.5.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/icu4j-51.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/iri-0.8.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-annotations-2.7.9.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-2.7.9.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-asl-1.8.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-databind-2.7.9.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-cbor-2.8.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-smile-2.8.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-yaml-2.8.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-jaxrs-1.9.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-mapper-asl-1.8.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-xc-1.9.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-cup-0.11a.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-property-utils-1.9.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javacc-4.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-core-2.5.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jdbc3-2.5.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jmx-2.5.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javassist-3.21.0-GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.inject-1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.json-1.0.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-core-2.2.11.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-impl-2.2.11.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxen-1.1.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jbig2-imageio-2.99.0-NX1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-el-1.0_02.CR6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-seam-2.3.1.Final.NX03.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jcip-annotations-1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jdbm-1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jedis-2.9.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jempbox-1.8.16.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jena-2.6.4-NX.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jericho-html-3.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-client-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-core-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-json-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-multipart-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-server-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-servlet-1.18.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jettison-1.3.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jgrapht-core-1.0.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmd-0.8.1-tomasol-3e60e36137.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmimemagic-0.1.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-4.4.0-1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-platform-4.4.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/joda-time-2.8.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jodconverter-core-3.0-NX10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jolokia-core-1.3.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jopt-simple-5.0.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-20070829.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-lib-2.4-jdk15.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-simple-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr250-api-1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr305-1.3.9.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jstl-1.1.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jta-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/juh-3.1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jurt-3.1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka-clients-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka_2.11-1.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lang-mustache-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-analyzers-common-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-backward-codecs-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-core-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-grouping-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-highlighter-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-join-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-memory-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-misc-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queries-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queryparser-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-sandbox-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-extras-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial3d-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-suggest-6.6.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lz4-java-1.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-core-3.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-graphite-3.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-jvm-3.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-log4j-3.0.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mimepull-1.9.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mina-core-1.1.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mvel2-2.2.4.FinalNX01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/neethi-3.0.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nekohtml-1.9.22.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-3.10.6.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-buffer-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-http-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-common-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-handler-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-resolver-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-transport-4.1.13.Final.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-core-storage-sql-extensions-9.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-stream-9.10-HF30.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-20090531.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-provider-20090531.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.core.jobs-3.5.0.v20100515.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.p2.cudf-1.17-NX.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.compendium-4.2.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.core-4.2.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.restlet-1.0.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.core-2.3.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.pb-2.3.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oro-2.0.8.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/parent-join-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/pdfbox-1.8.16.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/percolator-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/persistence-api-1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/plexus-utils-1.5.6.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-3.17.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-3.17.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-schemas-3.17.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-scratchpad-3.17.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/quartz-2.2.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/reindex-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/relaxngDatatype-20020414.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ridl-3.1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/sac-1.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/scala-library-2.11.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/securesm-1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-asn1-0.9.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-0.9.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-constants-0.9.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snakeyaml-1.13.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snappy-java-1.1.4.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax-api-1.0.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax2-api-3.1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stringtemplate-3.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/t-digest-3.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/taglibs-standard-impl-1.2.5.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-jdbc-8.5.23.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-juli-8.5.23.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tranql-connector-1.8.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty3-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty4-client-5.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/unoil-3.1.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/vaadin-sass-compiler-0.9.12-NX01.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/validation-api-1.0.0.GA.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/webdav-jaxrs-1.1.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wem-2.0.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/woodstox-core-asl-4.2.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wro4j-core-1.7.7.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wsdl4j-1.6.3.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xbean-naming-3.18.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xml-resolver-1.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlbeans-2.6.0.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlgraphics-commons-2.2.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlschema-core-2.2.1.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xpp3-1.1.4c-clean.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xsom-20140925.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xstream-1.4.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zkclient-0.10.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zookeeper-3.5.3-beta.jar [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/plugins/README.txt [new file with mode: 0644]
3rdparty/nuxeo/nuxeo-server/9.10-HF30/system.properties [new file with mode: 0644]
3rdparty/pom.xml
build.properties
cspace-ui/pom.xml
pom.xml
services/IntegrationTests/pom.xml
services/JaxRsServiceProvider/pom.xml
services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
services/PerformanceTests/pom.xml
services/account/client/pom.xml
services/account/service/pom.xml
services/acquisition/client/pom.xml
services/authentication/service/pom.xml
services/authority/pom.xml
services/authority/service/pom.xml
services/authorization-mgt/client/pom.xml
services/authorization-mgt/import/pom.xml
services/authorization-mgt/service/pom.xml
services/batch/client/pom.xml
services/batch/service/pom.xml
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/MergeAuthorityItemsBatchJob.java
services/blob/client/pom.xml
services/blob/service/pom.xml
services/citation/client/pom.xml
services/citation/service/pom.xml
services/claim/client/pom.xml
services/claim/service/pom.xml
services/client/pom.xml
services/collectionobject/client/pom.xml
services/collectionobject/service/pom.xml
services/common-test/pom.xml
services/common/build.xml
services/common/lib/nuxeo/nuxeo-runtime-launcher-9.10.jar [new file with mode: 0644]
services/common/lib/nuxeo/nuxeo-runtime-tomcat-adapter-9.10.jar [new file with mode: 0644]
services/common/lib/slf4j/jboss-logging-spi-2.1.0.GA.jar [deleted file]
services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar [new file with mode: 0644]
services/common/lib/slf4j/log4j-1.2.17.jar [new file with mode: 0644]
services/common/lib/slf4j/log4j-api-2.9.1.jar [new file with mode: 0644]
services/common/lib/slf4j/log4j-core-2.9.1.jar [new file with mode: 0644]
services/common/lib/slf4j/slf4j-api-1.6.1.jar [deleted file]
services/common/lib/slf4j/slf4j-api-1.7.21.jar [new file with mode: 0644]
services/common/lib/slf4j/slf4j-log4j12-1.6.1.jar [deleted file]
services/common/lib/slf4j/slf4j-log4j12-1.7.21.jar [new file with mode: 0644]
services/common/pom.xml
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/profile/BufferedServletInputStream.java
services/common/src/main/java/org/collectionspace/services/common/profile/BufferedServletOutputStream.java
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaRelationshipStorageClient.java
services/common/src/main/java/org/collectionspace/services/common/xmljson/JsonToXmlFilter.java
services/common/src/main/java/org/collectionspace/services/common/xmljson/JsonToXmlStreamConverter.java
services/common/src/main/java/org/collectionspace/services/common/xmljson/XmlToJsonFilter.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/NuxeoFrameworkBootstrap.java [new file with mode: 0644]
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoRepositoryClientImpl.java
services/concept/client/pom.xml
services/concept/service/pom.xml
services/conditioncheck/client/pom.xml
services/conditioncheck/service/pom.xml
services/conservation/client/pom.xml
services/conservation/service/pom.xml
services/contact/client/pom.xml
services/contact/service/pom.xml
services/dimension/client/pom.xml
services/dimension/service/pom.xml
services/exhibition/client/pom.xml
services/exhibition/service/pom.xml
services/group/client/pom.xml
services/group/service/pom.xml
services/imports/service/pom.xml
services/index/client/pom.xml
services/index/service/pom.xml
services/intake/client/pom.xml
services/intake/service/pom.xml
services/loanin/client/pom.xml
services/loanin/service/pom.xml
services/loanout/client/pom.xml
services/loanout/service/pom.xml
services/location/client/pom.xml
services/location/service/pom.xml
services/material/client/pom.xml
services/material/service/pom.xml
services/media/client/pom.xml
services/media/service/pom.xml
services/movement/client/pom.xml
services/movement/service/pom.xml
services/note/client/pom.xml
services/note/service/pom.xml
services/objectexit/client/pom.xml
services/objectexit/service/pom.xml
services/organization/client/pom.xml
services/organization/service/pom.xml
services/person/client/pom.xml
services/person/service/pom.xml
services/place/client/pom.xml
services/place/service/pom.xml
services/pom.xml
services/pottag/client/pom.xml
services/pottag/service/pom.xml
services/propagation/client/pom.xml
services/propagation/service/pom.xml
services/publicitem/client/pom.xml
services/publicitem/service/pom.xml
services/query/service/pom.xml
services/relation/client/pom.xml
services/relation/service/pom.xml
services/report/client/pom.xml
services/report/service/pom.xml
services/security/client/pom.xml
services/servicegroup/client/pom.xml
services/servicegroup/service/pom.xml
services/structureddate/client/pom.xml
services/structureddate/service/pom.xml
services/systeminfo/client/pom.xml
services/systeminfo/service/pom.xml
services/taxonomy/client/pom.xml
services/taxonomy/service/pom.xml
services/uoc/client/pom.xml
services/uoc/service/pom.xml
services/valuationcontrol/client/pom.xml
services/valuationcontrol/service/pom.xml
services/vocabulary/client/pom.xml
services/vocabulary/service/pom.xml
services/work/client/pom.xml
services/work/service/pom.xml
services/workflow/client/pom.xml
services/workflow/service/pom.xml

index f1e13e3f6faaf1955189d9852ca6920d5ca61420..c2b64192ca429f66d9cd6e3d17b306e248e7d0a8 100644 (file)
@@ -7,17 +7,17 @@
                        <schema name="dublincore" />
                        <schema name="collectionspace_core" />
                </doctype>
-               
+
                <!-- A facet for marking blobs/images that came from extern URLs -->
            <facet name="URLSourcedPicture">
-           </facet>            
+           </facet>
        </extension>
-       
+
        <!-- A schema def and doctype def for the "Subitem" document type. -->
        <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
                <schema name="subitem" prefix="subitem" src="schemas/subitem.xsd" />
        </extension>
-       
+
        <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
                <doctype name="Subitem" extends="CollectionSpaceDocument">
                        <schema name="common" />
                        <schema name="subitem" />
                </doctype>
        </extension>
-       
+
+       <!--
+               As of Nuxeo 9.3, Nuxeo does not do sparse updates by default.
+               Set clearComplexPropertyBeforeSet to false to restore this behavior.
+       -->
+       <extension target="org.nuxeo.ecm.core.schema.TypeService" point="configuration">
+               <configuration>
+                       <clearComplexPropertyBeforeSet>false</clearComplexPropertyBeforeSet> <!-- false is DEPRECATED since 9.3 -->
+               </configuration>
+       </extension>
+
        <!--
                Register new MIME types that are not in the default set
        -->
index f32464b3f11aaebeb72441c7460968a611fb409f..5372482b77136e48f5c03ba24809e8281937b99e 100644 (file)
@@ -12,6 +12,7 @@ import java.util.Set;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.apache.commons.lang3.StringUtils;
+
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
index f18a58f71f1ebe2e3b3bab5a9e201cf77bd86984..f9066885aab2f6147b162004827347096e7ac8ce 100644 (file)
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>org.collectionspace.services.3rdparty.nuxeo.listener</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>5.2-SNAPSHOT</version>        
+        <version>5.2-SNAPSHOT</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
     <name>org.collectionspace.services.listener.botgarden</name>
     <url>http://maven.apache.org</url>
 
-        
+
        <dependencies>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
@@ -25,7 +25,7 @@
            <dependency>
              <groupId>org.nuxeo.ecm.platform</groupId>
              <artifactId>nuxeo-platform-filemanager-api</artifactId>
-                 <version>${nuxeo.platform.version}</version>        
+                 <version>${nuxeo.platform.version}</version>
            </dependency>
            <dependency>
             <groupId>org.collectionspace.services</groupId>
@@ -44,7 +44,7 @@
         </dependency>
        </dependencies>
 
-       
+
     <build>
         <resources>
             <resource>
@@ -68,5 +68,5 @@
             </plugin>
         </plugins>
     </build>
-       
+
 </project>
index d2f046130847b3e0476d091e42f88d62430c56c8..3c42494b22bf7f94f2827600212819a3ee232c4f 100644 (file)
@@ -15,7 +15,7 @@
     <name>org.collectionspace.services.listener.naturalhistory</name>
     <url>http://maven.apache.org</url>
 
-        
+
        <dependencies>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
@@ -25,7 +25,7 @@
            <dependency>
              <groupId>org.nuxeo.ecm.platform</groupId>
              <artifactId>nuxeo-platform-filemanager-api</artifactId>
-                 <version>${nuxeo.platform.version}</version>        
+                 <version>${nuxeo.platform.version}</version>
            </dependency>
            <dependency>
             <groupId>org.collectionspace.services</groupId>
@@ -34,7 +34,7 @@
         </dependency>
        </dependencies>
 
-       
+
     <build>
         <resources>
             <resource>
@@ -58,5 +58,5 @@
             </plugin>
         </plugins>
     </build>
-       
+
 </project>
index 093c67f3935f1d520b1ae4ebe81417a7bd88d6db..bd618c3ecbc6066f18d5ae8f50254dd1d754cd2f 100644 (file)
             <artifactId>nuxeo-platform-filemanager-api</artifactId>
             <version>${nuxeo.platform.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.nuxeo.ecm.platform</groupId>
+            <artifactId>nuxeo-platform-imaging-api</artifactId>
+            <version>${nuxeo.platform.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
index aaa1d08a1212a0a320653982c2b8e155a0626d46..e18f3cd3e9e771abd144cc6511035345203c1bfc 100644 (file)
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
@@ -46,5 +46,5 @@
             </plugin>
         </plugins>
     </build>
-       
+
 </project>
index 63ac9b9dc815008ee8a93dd6057eeddd9dae2fcb..07f69845c8bd435315fd66e3480fdb3e6cf50f7d 100644 (file)
@@ -14,7 +14,7 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
-       
+
        <dependencies>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
            <dependency>
              <groupId>org.nuxeo.ecm.platform</groupId>
              <artifactId>nuxeo-platform-filemanager-api</artifactId>
-                 <version>${nuxeo.platform.version}</version>        
+                 <version>${nuxeo.platform.version}</version>
            </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-convert</artifactId>
             <version>${nuxeo.core.version}</version>
         </dependency>
-           <dependency>
-             <groupId>org.nuxeo.ecm.platform</groupId>
-             <artifactId>nuxeo-platform-imaging-core</artifactId>
-             <version>${nuxeo.platform.version}</version>
-           </dependency>        
+        <dependency>
+          <groupId>org.nuxeo.ecm.platform</groupId>
+          <artifactId>nuxeo-platform-imaging-core</artifactId>
+          <version>${nuxeo.platform.version}</version>
+          <scope>provided</scope>
+        </dependency>
        </dependencies>
-       
+
     <build>
                <resources>
             <resource>
@@ -61,5 +62,5 @@
             </plugin>
         </plugins>
     </build>
-       
+
 </project>
index 33029f68005a54aec5de13a231e81d25f704e5b1..4b242477b03dbe373aa156979524a08f990fbf25 100644 (file)
@@ -13,8 +13,8 @@
       httpEnabled="true" />
   </extension>
   -->
-  
-  <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+
+  <!-- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
     point="elasticSearchRemote">
     <elasticSearchRemote
       clusterName="elasticsearch"
       clientTransportIgnoreClusterName="false"
       clientTransportPingTimeout="5s"
       clientTransportNodesSamplerInterval="5s" />
-  </extension>
+  </extension> -->
+
+  <!-- <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchClient">
+    <elasticSearchClient class="org.nuxeo.elasticsearch.client.ESRestClientFactory">
+      <option name="addressList">http://localhost:9200</option>
+      <option name="connection.timeout.ms">5000</option>
+      <option name="socket.timeout.ms">20000</option>
+    </elasticSearchClient>
+  </extension> -->
 
   %elasticSearchIndex_extensions%
 
   </component>
-
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/README.txt b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/README.txt
new file mode 100644 (file)
index 0000000..08bbdd4
--- /dev/null
@@ -0,0 +1,2 @@
+This folder contains the Nuxeo modules
+These modules are required to run the nuxeo framework
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-core-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-core-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..4f2c6e4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-core-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-io-9.10-HF03.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-io-9.10-HF03.jar
new file mode 100644 (file)
index 0000000..7b4f7c2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-automation-io-9.10-HF03.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-common-9.10-HF25.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-common-9.10-HF25.jar
new file mode 100644 (file)
index 0000000..f6ef6e1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-common-9.10-HF25.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..8eef39f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-api-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-api-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..b605790
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-api-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-common-9.10-HF20.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-common-9.10-HF20.jar
new file mode 100644 (file)
index 0000000..d75a2f5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-common-9.10-HF20.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-s3-9.10-HF26.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-s3-9.10-HF26.jar
new file mode 100644 (file)
index 0000000..a8dae34
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-binarymanager-s3-9.10-HF26.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-cache-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-cache-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..78d925f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-cache-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-9.10-HF29.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-9.10-HF29.jar
new file mode 100644 (file)
index 0000000..a8fba8d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-9.10-HF29.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-api-9.10.jar
new file mode 100644 (file)
index 0000000..75f2bc2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-plugins-9.10-HF29.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-plugins-9.10-HF29.jar
new file mode 100644 (file)
index 0000000..dfc6004
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-convert-plugins-9.10-HF29.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-el-9.10-HF24.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-el-9.10-HF24.jar
new file mode 100644 (file)
index 0000000..f416fbc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-el-9.10-HF24.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-event-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-event-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..2522ce7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-event-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-io-9.10-HF27.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-io-9.10-HF27.jar
new file mode 100644 (file)
index 0000000..e30253d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-io-9.10-HF27.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-9.10-HF02.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-9.10-HF02.jar
new file mode 100644 (file)
index 0000000..b340394
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-9.10-HF02.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-jtajca-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-jtajca-9.10.jar
new file mode 100644 (file)
index 0000000..54eccbb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-management-jtajca-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-mimetype-9.10-HF19.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-mimetype-9.10-HF19.jar
new file mode 100644 (file)
index 0000000..6f9b792
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-mimetype-9.10-HF19.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-persistence-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-persistence-9.10.jar
new file mode 100644 (file)
index 0000000..d386cde
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-persistence-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-query-9.10-HF18.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-query-9.10-HF18.jar
new file mode 100644 (file)
index 0000000..882ef6f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-query-9.10-HF18.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-redis-9.10-HF01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-redis-9.10-HF01.jar
new file mode 100644 (file)
index 0000000..22811e4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-redis-9.10-HF01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-schema-9.10-HF10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-schema-9.10-HF10.jar
new file mode 100644 (file)
index 0000000..588b11e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-schema-9.10-HF10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-9.10-HF27.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-9.10-HF27.jar
new file mode 100644 (file)
index 0000000..b809b34
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-9.10-HF27.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-dbs-9.10-HF19.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-dbs-9.10-HF19.jar
new file mode 100644 (file)
index 0000000..deda253
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-dbs-9.10-HF19.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-mongodb-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-mongodb-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..52b11cf
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-mongodb-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..7bc703b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-management-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-management-9.10.jar
new file mode 100644 (file)
index 0000000..7b76130
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-core-storage-sql-management-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-dmk-adaptor-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-dmk-adaptor-9.10.jar
new file mode 100644 (file)
index 0000000..5de28f2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-dmk-adaptor-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-elasticsearch-core-9.10-HF29.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-elasticsearch-core-9.10-HF29.jar
new file mode 100644 (file)
index 0000000..6efbd6c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-elasticsearch-core-9.10-HF29.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-core-9.10-HF23.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-core-9.10-HF23.jar
new file mode 100644 (file)
index 0000000..7c9c251
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-core-9.10-HF23.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-jaxrs-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-jaxrs-9.10.jar
new file mode 100644 (file)
index 0000000..2e2d308
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-jaxrs-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-stream-9.10-HF04.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-stream-9.10-HF04.jar
new file mode 100644 (file)
index 0000000..0ff718f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-importer-stream-9.10-HF04.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-invite-9.10-HF29.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-invite-9.10-HF29.jar
new file mode 100644 (file)
index 0000000..6947648
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-invite-9.10-HF29.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-launcher-commons-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-launcher-commons-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..e470003
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-launcher-commons-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-bindings-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-bindings-9.10.jar
new file mode 100644 (file)
index 0000000..baaf582
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-bindings-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-impl-9.10-HF09.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-impl-9.10-HF09.jar
new file mode 100644 (file)
index 0000000..ef7a564
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-opencmis-impl-9.10-HF09.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-9.10.jar
new file mode 100644 (file)
index 0000000..78bfb3b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-actions-core-9.10-HF08.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-actions-core-9.10-HF08.jar
new file mode 100644 (file)
index 0000000..6ce09b6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-actions-core-9.10-HF08.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-api-9.10.jar
new file mode 100644 (file)
index 0000000..ef73527
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-commandline-executor-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-commandline-executor-9.10.jar
new file mode 100644 (file)
index 0000000..994511d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-commandline-executor-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar
new file mode 100644 (file)
index 0000000..c46e04b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-convert-9.10-HF28.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-default-config-9.10-HF09.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-default-config-9.10-HF09.jar
new file mode 100644 (file)
index 0000000..a934000
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-default-config-9.10-HF09.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-dublincore-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-dublincore-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..d1e9544
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-dublincore-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-api-9.10-HF07.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-api-9.10-HF07.jar
new file mode 100644 (file)
index 0000000..df1d586
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-api-9.10-HF07.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-9.10-HF01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-9.10-HF01.jar
new file mode 100644 (file)
index 0000000..6b8f54b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-9.10-HF01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-listener-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-listener-9.10.jar
new file mode 100644 (file)
index 0000000..c393881
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-filemanager-core-listener-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-htmlsanitizer-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-htmlsanitizer-9.10.jar
new file mode 100644 (file)
index 0000000..47f6495
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-htmlsanitizer-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-api-9.10.jar
new file mode 100644 (file)
index 0000000..aa2d08a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-convert-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-convert-9.10.jar
new file mode 100644 (file)
index 0000000..0d6c0db
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-convert-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-core-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-core-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..32f2161
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-imaging-core-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-api-9.10.jar
new file mode 100644 (file)
index 0000000..bb91033
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-core-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-core-9.10.jar
new file mode 100644 (file)
index 0000000..2c1b8ae
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-io-core-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-9.10-HF16.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-9.10-HF16.jar
new file mode 100644 (file)
index 0000000..f78741f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-9.10-HF16.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-ext-9.10-HF01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-ext-9.10-HF01.jar
new file mode 100644 (file)
index 0000000..9f7e5a8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-lang-ext-9.10-HF01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-9.10-HF03.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-9.10-HF03.jar
new file mode 100644 (file)
index 0000000..adf39a7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-9.10-HF03.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-default-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-default-9.10.jar
new file mode 100644 (file)
index 0000000..d95be7d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-default-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-digest-9.10-HF01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-digest-9.10-HF01.jar
new file mode 100644 (file)
index 0000000..97cabd2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-digest-9.10-HF01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-token-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-token-9.10.jar
new file mode 100644 (file)
index 0000000..77e1df6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-login-token-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-oauth-9.10-HF29.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-oauth-9.10-HF29.jar
new file mode 100644 (file)
index 0000000..6b9d3f5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-oauth-9.10-HF29.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-query-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-query-api-9.10.jar
new file mode 100644 (file)
index 0000000..2139f25
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-query-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-relations-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-relations-api-9.10.jar
new file mode 100644 (file)
index 0000000..9c1504e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-relations-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-rendition-core-9.10-HF25.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-rendition-core-9.10-HF25.jar
new file mode 100644 (file)
index 0000000..27f3794
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-rendition-core-9.10-HF25.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-search-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-search-api-9.10.jar
new file mode 100644 (file)
index 0000000..c67fac6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-search-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-api-9.10.jar
new file mode 100644 (file)
index 0000000..1f7dc36
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-core-9.10-HF27.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-core-9.10-HF27.jar
new file mode 100644 (file)
index 0000000..391410d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-tag-core-9.10-HF27.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-api-9.10.jar
new file mode 100644 (file)
index 0000000..14124e9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-core-9.10-HF26.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-core-9.10-HF26.jar
new file mode 100644 (file)
index 0000000..a01ace3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-types-core-9.10-HF26.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-uidgen-core-9.10-HF02.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-uidgen-core-9.10-HF02.jar
new file mode 100644 (file)
index 0000000..74b6adb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-uidgen-core-9.10-HF02.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-api-9.10.jar
new file mode 100644 (file)
index 0000000..f90d8d5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-core-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-core-9.10.jar
new file mode 100644 (file)
index 0000000..9b833dd
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-url-core-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-api-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-api-9.10.jar
new file mode 100644 (file)
index 0000000..d1a090d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-api-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-core-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-core-9.10.jar
new file mode 100644 (file)
index 0000000..5ff97d7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-platform-versioning-core-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-9.10-HF23.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-9.10-HF23.jar
new file mode 100644 (file)
index 0000000..7ddcb93
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-9.10-HF23.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-datasource-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-datasource-9.10.jar
new file mode 100644 (file)
index 0000000..97448a7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-datasource-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-deploy-9.10-HF14.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-deploy-9.10-HF14.jar
new file mode 100644 (file)
index 0000000..8c8570f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-deploy-9.10-HF14.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-jtajca-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-jtajca-9.10.jar
new file mode 100644 (file)
index 0000000..fe768f3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-jtajca-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-kv-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-kv-9.10.jar
new file mode 100644 (file)
index 0000000..a6183df
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-kv-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-management-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-management-9.10.jar
new file mode 100644 (file)
index 0000000..224d359
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-management-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-metrics-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-metrics-9.10.jar
new file mode 100644 (file)
index 0000000..c44361e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-metrics-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-migration-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-migration-9.10.jar
new file mode 100644 (file)
index 0000000..665ec70
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-migration-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-osgi-9.10-HF04.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-osgi-9.10-HF04.jar
new file mode 100644 (file)
index 0000000..bdbeec1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-osgi-9.10-HF04.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-reload-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-reload-9.10.jar
new file mode 100644 (file)
index 0000000..3350273
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/bundles/nuxeo-runtime-reload-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/convert-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/convert-config.xml
new file mode 100644 (file)
index 0000000..9c50f3e
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.core.convert.config">
+    <extension target="org.nuxeo.ecm.core.convert.service.ConversionServiceImpl"
+        point="configuration">
+        <configuration>
+            <!-- define directory location for caching : As of Nuxeo 7, defaults to ${NUXEO_HOME}/data/convertcache  -->
+            <!-- <cachingDirectory>full-path-to-a-directory</cachingDirectory> -->
+            
+            <!-- GC (garbage collection) interval in minutes (default = 10 minutes ) -->
+            <!-- Garbage collector will empty the dir and sub-dirs of all files -->
+            <gcInterval>60</gcInterval>
+            
+            <!-- maximum size for disk cache in KB (default to 10*1024) -->
+            <diskCacheSize>10240</diskCacheSize>
+            
+            <!-- Enables or disables caching (default = true)-->
+            <enableCache>true</enableCache>
+        </configuration>
+    </extension>
+</component>
\ No newline at end of file
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/elasticsearch-classreplacer-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/elasticsearch-classreplacer-config.xml
new file mode 100644 (file)
index 0000000..9854c1b
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.ecm.platform.query.api.PageProviderservice.replacers.defaultConfig">
+
+  <extension target="org.nuxeo.ecm.platform.query.api.PageProviderService" point="replacers">
+
+    <replacer withClass="org.nuxeo.elasticsearch.provider.ElasticSearchNxqlPageProvider"
+      enabled="${elasticsearch.enabled:=true}">
+      <provider>default_search</provider>
+    </replacer>
+
+  </extension>
+</component>
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/login-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/login-config.xml
new file mode 100644 (file)
index 0000000..d63b733
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<!--
+       This is the configuration the CollectionSpace services used when it was deployed on the JBoss AS.  However,
+       it still works (and is required) in our Apache Tomcat deployment.
+       
+       12/8/2011 - We need to confirm with Nuxeo that this is correct configuration for their LoginComponent. 
+ -->
+<component name="org.nuxeo.ecm.platform.login.LoginConfig"
+       version="1.0">
+       <documentation>
+               Login modules used on JBoss
+               @author Bogdan Stefanescu (bs@nuxeo.com)
+       </documentation>
+
+
+       <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
+
+               <domain name="nuxeo-system-login">
+                       <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule"
+                               flag="required" />
+                       <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule"
+                               flag="required">
+                               <option name="password-stacking">true</option>
+                               <option name="multi-threaded">true</option>
+                       </login-module>
+               </domain>
+
+
+               <domain name="nuxeo-webengine">
+                       <login-module code="org.nuxeo.ecm.platform.login.NuxeoLoginModule"
+                               flag="required">
+                               <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal
+                               </option>
+                               <option name="useUserIdentificationInfoCB">true</option>
+                       </login-module>
+                       <!--login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" 
+                               flag="required"> <option name="password-stacking">true</option> <option name="multi-threaded">true</option> 
+                               </login-module -->
+               </domain>
+
+       </extension>
+
+
+</component>
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo-container.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo-container.properties
new file mode 100644 (file)
index 0000000..003c8de
--- /dev/null
@@ -0,0 +1 @@
+NuxeoContainer.autoactivation=true
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/nuxeo.properties
new file mode 100644 (file)
index 0000000..5f72426
--- /dev/null
@@ -0,0 +1,58 @@
+# application instance config
+org.nuxeo.ecm.instance.host=localhost
+
+# enable/disable Elasticsearch
+elasticsearch.enabled=false
+audit.elasticsearch.enabled=false
+
+# runtime remoting config
+org.nuxeo.runtime.server.locator=socket://0.0.0.0:62474/?datatype=nuxeo
+org.nuxeo.runtime.server.enabled=false
+org.nuxeo.runtime.server.host=${org.nuxeo.ecm.instance.host}
+
+# streaming config
+org.nuxeo.runtime.streaming.isServer=false
+org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
+
+# runtime management config
+org.nuxeo.runtime.management.exist=false
+org.nuxeo.runtime.management.serverRmiPort=2100
+
+# needed for the JNDI auto configuration of clients
+# you need to change this if using JNDI through HTTP
+nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
+nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+
+# for email attachment, to decode the encoded(utf) filenames.
+mail.mime.decodefilename=true
+
+# LiveEdit configuration detection (client/server/both)
+org.nuxeo.ecm.platform.liveedit.config=client
+
+# Uncomment to activate Nuxeo Runtime REST API for Management
+# accessible via http://server:port/nuxeo/site/server/html on JBoss
+#org.nuxeo.runtime.rest.management=true
+
+# size limit to use the specific download servlet for big files (use SI or IEC prefix)
+#org.nuxeo.big.file.size.limit=5Mi
+
+###
+# Older settings that were used with CollectionSpace and Nuxeo v5.5
+###
+
+#org.nuxeo.ecm.instance.name=Nuxeo 5.5
+#org.nuxeo.ecm.instance.description=Nuxeo ECM server
+
+# product config
+#org.nuxeo.ecm.product.name=Nuxeo 5.5
+#org.nuxeo.ecm.product.version=5.5
+
+# which sample to run
+#org.nuxeo.ecm.sample.class=org.nuxeo.ecm.sample.streaming.StreamingExample
+
+# avoid initializing nuxeo relations at startup (for faster startup)
+#org.nuxeo.ecm.platform.relations.initOnStartup=false
+
+# context path of the application
+#org.nuxeo.ecm.contextPath=/nuxeo
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-datasource-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-datasource-config.xml
new file mode 100644 (file)
index 0000000..4887c16
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.runtime.datasource.testsci.contrib">
+       
+  <extension target="org.nuxeo.runtime.datasource" point="datasources">
+       <datasource name="jdbc/testsci_domain" driverClassName="org.postgresql.Driver"
+      maxPoolSize="100" minPoolSize="5" blockingTimeoutMillis="10000"
+      url="jdbc:postgresql://localhost:5432/testsci_domain" validationQuery=""
+      username="nuxeo6" password="nuxeo6"
+      accessToUnderlyingConnectionAllowed="true" >
+    </datasource>
+    <link name="jdbc/repository_testsci_domain" global="jdbc/testsci_domain" type="javax.sql.DataSource" />
+
+       <!--
+               These links need to be moved into the context.xml file and become <Resource> instead of <link>
+       -->
+    <link name="jdbc/repository_default" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/repository_default" global="jdbc/default" type="javax.sql.DataSource"/>
+    <link name="jdbc/NuxeoDS" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxsqldirectory" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxrelations-default-jena" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/comment-relations" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxaudit-logs" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxjbpm" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/placeful_service_ds" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxwebwidgets" global="jdbc/default" type="javax.sql.DataSource" />
+    <link name="jdbc/nxuidsequencer" global="jdbc/default" type="javax.sql.DataSource" />
+       
+       <!-- These properties are passed into the CSpace code that generates the final version
+       of this Nuxeo configuration file.
+       -->
+       <property name="ServerName">@DB_SERVER_HOSTNAME@</property>
+       <property name="JDBCOptions">@DB_JDBC_OPTIONS@</property>
+       <property name="PortNumber">@DB_PORT@</property>
+       <property name="User">@NUXEO_USER@</property>
+       <property name="Password">@NUXEO_PW@</property>
+  </extension>
+</component>
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-config.xml
new file mode 100644 (file)
index 0000000..e8f284e
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<component name="org.nuxeo.elasticsearch.defaultConfig">
+  <require>org.nuxeo.elasticsearch.ElasticSearchComponent</require>
+
+  <!--
+  <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
+    point="elasticSearchEmbeddedServer">
+    <elasticSearchLocal
+      clusterName="elasticsearch"
+      nodeName="nuxeoNode"
+      pathData="/usr/local/share/apache-tomcat-8.5.40/nuxeo-server/data/elasticsearch"
+      pathLogs="/usr/local/share/apache-tomcat-8.5.40/nuxeo-server/log/elasticsearch"
+      httpEnabled="true" />
+  </extension>
+  -->
+
+  <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchClient">
+    <elasticSearchClient class="org.nuxeo.elasticsearch.client.ESRestClientFactory">
+      <option name="addressList">http://localhost:9200</option>
+    </elasticSearchClient>
+  </extension>
+
+  %elasticSearchIndex_extensions%
+
+  </component>
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-elasticsearch-extension.xml
new file mode 100644 (file)
index 0000000..3a30651
--- /dev/null
@@ -0,0 +1,162 @@
+<extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
+  <elasticSearchIndex name="index_name_placeholder" type="doc" repository="repository_name_placeholder">
+    <fetchFromSource>
+      <include>ecm:*</include>
+      <include>dc:*</include>
+      <exclude>ecm:binarytext</exclude>
+    </fetchFromSource>
+
+    <settings>
+      {
+        "analysis" : {
+          "char_filter" : {
+            "refname_displayname" : {
+              "type" : "pattern_replace",
+              "pattern" : "^.*?'(.*)'$",
+              "replacement" : "$1"
+            },
+            "refname_shortid" : {
+              "type" : "pattern_replace",
+              "pattern" : "^.*:item:name\\((.*)\\).*$",
+              "replacement" : "$1"
+            },
+            "doctype_tenant_unqualified" : {
+              "type" : "pattern_replace",
+              "pattern" : "^(.*?)(Tenant.*)?$",
+              "replacement" : "$1"
+            }
+          },
+          "filter" : {
+            "en_stem_filter" : {
+              "name" : "minimal_english",
+              "type" : "stemmer"
+            },
+            "en_stop_filter" : {
+              "stopwords" : [
+                "_english_"
+              ],
+              "type" : "stop"
+            },
+            "fr_elision_filter" : {
+              "articles" : [
+                "c",
+                "l",
+                "m",
+                "t",
+                "qu",
+                "n",
+                "s",
+                "j"
+              ],
+              "type" : "elision"
+            },
+            "fr_stem_filter" : {
+              "name" : "minimal_french",
+              "type" : "stemmer"
+            },
+            "fr_stop_filter" : {
+              "stopwords" : [
+                "_french_"
+              ],
+              "type" : "stop"
+            }
+          },
+          "tokenizer" : {
+            "path_tokenizer" : {
+              "delimiter" : "/",
+              "type" : "path_hierarchy"
+            }
+          },
+          "analyzer" : {
+            "en_analyzer" : {
+              "alias" : "fulltext",
+              "filter" : [
+                "lowercase",
+                "en_stop_filter",
+                "en_stem_filter",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "fr_analyzer" : {
+              "filter" : [
+                "lowercase",
+                "fr_stop_filter",
+                "fr_stem_filter",
+                "asciifolding",
+                "fr_elision_filter"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "path_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "path_tokenizer"
+            },
+            "refname_displayname_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["refname_displayname"]
+            },
+            "refname_displayname_fulltext_analyzer" : {
+              "char_filter" : ["refname_displayname"],
+              "filter" : [
+                "lowercase",
+                "en_stop_filter",
+                "en_stem_filter",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "refname_shortid_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["refname_shortid"]
+            },
+            "doctype_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["doctype_tenant_unqualified"]
+            },
+            "sorting_analyzer" : {
+              "filter" : [
+                "lowercase",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "keyword"
+            },
+            "default" : {
+              "type" : "custom",
+              "tokenizer" : "keyword"
+            }
+          }
+        }
+      }
+    </settings>
+
+    <mapping>
+      {
+        "_size" : {
+          "enabled" : true
+        },
+        "_all" : {
+          "analyzer" : "fulltext"
+        },
+        "properties" : {
+          "ecm:currentLifeCycleState": {
+            "type": "string",
+            "include_in_all": "false"
+          },
+          "ecm:primaryType": {
+            "type": "string",
+            "analyzer" : "doctype_analyzer",
+            "include_in_all": "false"
+          }
+        }
+      }
+    </mapping>
+  </elasticSearchIndex>
+</extension>
\ No newline at end of file
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/proto-repo-config.xml
new file mode 100644 (file)
index 0000000..6dd85c1
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+       This is a prototype/template file for Nuxeo repository configuration files.
+       For each tenant that has their own repository specified in the CollectionSpace
+       tenant bindings file, we will create a corresponding Nuxeo repository config-
+       uration file.  You won't have to change the value for most of these elements
+       and attributes because they will be set when CollectionSpace starts.
+       
+       *** NOTE *** One value you may want to change is the 'binaryStore' path which is the location
+       that Nuxeo places binary files like images and PDF documents. Be sure to read the comment to
+       the right of the <binaryStore> element below.
+-->
+
+<!-- *** WARNING *** Don't manually change the values here unless you know exactly what you're doing. -->
+
+<!-- Values in the following elements are primarily added during execution -->
+<!-- of the 'ant deploy' command, within the Services source code tree. -->
+<!-- (Several values are also added during system startup, into repository-specific -->
+<!-- 'clones' of this prototype configuration file, as noted below.) --> 
+<!-- See http://doc.nuxeo.com/display/ADMINDOC/VCS+Configuration for more config details -->
+<component name="config:default-repository">
+       <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration">
+               <blobprovider name="default">
+                       <class>org.nuxeo.ecm.core.blob.binary.DefaultBinaryManager</class>
+                       <property name="path"></property>
+                       <property name="key"></property>
+               </blobprovider>
+       </extension>
+    <extension target="org.nuxeo.ecm.core.storage.sql.RepositoryService" point="repository">
+        <repository name="default" factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
+                       <pool minPoolSize="0" maxPoolSize="20" blockingTimeoutMillis="100" idleTimeoutMinutes="10"/>
+                       <clustering enabled="false" delay="1000"/>                
+                       <xa-datasource>@XA_DATASOURCE@</xa-datasource> <!-- The transactional datasource for Nuxeo -->
+                       <noDDL>false</noDDL>
+                       <sqlInitFile>vcsconfig.sql.txt</sqlInitFile> <!-- see https://doc.nuxeo.com/display/ADMINDOC/VCS+Configuration#VCSConfiguration-DatabaseCreationOption -->              
+                       <aclOptimizations enabled="true"/>
+                       <pathOptimizations enabled="true"/>
+                       <idType>varchar</idType>
+                       <indexing>
+                       <fulltext disabled="false" analyzer="english">
+                         <index name="default">
+                               <!-- all props implied -->
+                         </index>
+                         <index name="title">
+                               <field>dc:title</field>
+                         </index>
+                         <index name="description">
+                               <field>dc:description</field>
+                         </index>
+                       </fulltext>
+                       </indexing>
+                       <usersSeparator key="," />                      
+                       <property name="ServerName">@DB_SERVER_HOSTNAME@</property>
+                       <property name="DatabaseName"></property> <!-- The value of the database name element is inserted during system startup. -->
+                       <property name="JDBCOptions">@DB_JDBC_OPTIONS@</property>
+                       <property name="PortNumber">@DB_PORT@</property>
+                       <property name="User">@NUXEO_USER@</property>
+                       <property name="Password">@NUXEO_PW@</property>
+        </repository>
+    </extension>
+</component>
\ No newline at end of file
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/s3binarymanager.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/s3binarymanager.properties
new file mode 100644 (file)
index 0000000..7eafeb4
--- /dev/null
@@ -0,0 +1,3 @@
+nuxeo.s3storage.bucket=__bucketname__
+nuxeo.s3storage.awsid=__AWSAccessKeyId__
+nuxeo.s3storage.awssecret=__AWSSecretKey__
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/vcsconfig.sql.txt b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/config/vcsconfig.sql.txt
new file mode 100644 (file)
index 0000000..ba24156
--- /dev/null
@@ -0,0 +1,40 @@
+#
+# A place to modify the Nuxeo database with SQL statements.
+# See https://doc.nuxeo.com/display/ADMINDOC/VCS+Configuration#VCSConfiguration-DatabaseCreationOption
+# or https://doc.nuxeo.com/nxdoc/repository-configuration/#page-title
+#
+
+#CATEGORY: afterTableCreation
+
+#
+# Add a unique constraint to the report 'name' column of the reports_common table.
+#
+LOG.INFO Adding a unique constraint to the report 'name' column of the reports_common table
+
+#TEST:
+SELECT constraint_name FROM information_schema.constraint_column_usage WHERE table_name = 'reports_common' AND constraint_name = 'reportname_unique';
+
+#IF: emptyResult
+ALTER TABLE reports_common add CONSTRAINT reportname_unique UNIQUE (name);
+
+#
+# Add a unique constraint to the batch job 'name' column of the batch_common table.
+#
+LOG.INFO Adding a unique constraint to the batch 'name' column of the batch_common table
+
+#TEST:
+SELECT constraint_name FROM information_schema.constraint_column_usage WHERE table_name = 'batch_common' AND constraint_name = 'batchname_unique';
+
+#IF: emptyResult
+ALTER TABLE batch_common add CONSTRAINT batchname_unique UNIQUE (name);
+
+#
+# Add constraint to the relations table to prevent duplicate relationships
+#
+#LOG.INFO Adding constraint to the relations table to prevent duplicate relationships
+
+#TEST:
+SELECT constraint_name FROM information_schema.constraint_column_usage WHERE table_name = 'relations_common' AND constraint_name = 'relations_unique';
+
+#IF: emptyResult
+ALTER TABLE relations_common add CONSTRAINT relations_unique UNIQUE (subjectcsid, subjectrefname, relationshiptype, objectcsid, objectrefname, active);
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/launcher.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/launcher.properties
new file mode 100644 (file)
index 0000000..3629c1a
--- /dev/null
@@ -0,0 +1 @@
+org.nuxeo.app.bundles=bundles/*:plugins/*
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/HdrHistogram-2.1.9.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/HdrHistogram-2.1.9.jar
new file mode 100644 (file)
index 0000000..efa2637
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/HdrHistogram-2.1.9.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/README.txt b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/README.txt
new file mode 100644 (file)
index 0000000..be3823d
--- /dev/null
@@ -0,0 +1 @@
+This folder contains static libraries used by nuxeo components
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/activation-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/activation-1.1.jar
new file mode 100644 (file)
index 0000000..53f82a1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/activation-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/affinity-3.1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/affinity-3.1.1.jar
new file mode 100644 (file)
index 0000000..dbf280e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/affinity-3.1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aggs-matrix-stats-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aggs-matrix-stats-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..cec66da
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aggs-matrix-stats-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/annotations-12.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/annotations-12.0.jar
new file mode 100644 (file)
index 0000000..7f8b362
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/annotations-12.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-1.7.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-1.7.0.jar
new file mode 100644 (file)
index 0000000..0a56a58
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-1.7.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-launcher-1.7.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-launcher-1.7.0.jar
new file mode 100644 (file)
index 0000000..12a1e78
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ant-launcher-1.7.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antisamy-1.5.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antisamy-1.5.7.jar
new file mode 100644 (file)
index 0000000..06b37a6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antisamy-1.5.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-2.7.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-2.7.7.jar
new file mode 100644 (file)
index 0000000..5e5f14b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-2.7.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-runtime-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-runtime-3.1.3.jar
new file mode 100644 (file)
index 0000000..b0a9ea6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/antlr-runtime-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aopalliance-1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aopalliance-1.0.jar
new file mode 100644 (file)
index 0000000..578b1a0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/aopalliance-1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-bootstrap-extract-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-bootstrap-extract-1.5.1.jar
new file mode 100644 (file)
index 0000000..feb162d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-bootstrap-extract-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-btree-base-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-btree-base-1.5.1.jar
new file mode 100644 (file)
index 0000000..ab0a1a9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-btree-base-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-constants-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-constants-1.5.1.jar
new file mode 100644 (file)
index 0000000..9cd6844
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-constants-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-1.5.1.jar
new file mode 100644 (file)
index 0000000..d875f0a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-shared-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-shared-1.5.1.jar
new file mode 100644 (file)
index 0000000..f682417
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-core-shared-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-jdbm-store-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-jdbm-store-1.5.1.jar
new file mode 100644 (file)
index 0000000..012ed7c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-jdbm-store-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-kerberos-shared-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-kerberos-shared-1.5.1.jar
new file mode 100644 (file)
index 0000000..625e4cf
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-kerberos-shared-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-protocol-shared-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-protocol-shared-1.5.1.jar
new file mode 100644 (file)
index 0000000..bebbb22
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-protocol-shared-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-bootstrap-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-bootstrap-1.5.1.jar
new file mode 100644 (file)
index 0000000..ae0c31c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-bootstrap-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-registries-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-registries-1.5.1.jar
new file mode 100644 (file)
index 0000000..1d703e4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-schema-registries-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-utils-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-utils-1.5.1.jar
new file mode 100644 (file)
index 0000000..2942bc0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/apacheds-utils-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/arq-2.8.8.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/arq-2.8.8.jar
new file mode 100644 (file)
index 0000000..280f028
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/arq-2.8.8.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/asm-5.0.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/asm-5.0.3.jar
new file mode 100644 (file)
index 0000000..573535b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/asm-5.0.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-constants-1.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-constants-1.10.jar
new file mode 100644 (file)
index 0000000..4018f90
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-constants-1.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-css-1.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-css-1.10.jar
new file mode 100644 (file)
index 0000000..d08de4a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-css-1.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-i18n-1.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-i18n-1.10.jar
new file mode 100644 (file)
index 0000000..8362430
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-i18n-1.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-util-1.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-util-1.10.jar
new file mode 100644 (file)
index 0000000..ae4b46e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/batik-util-1.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/c3p0-0.9.1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/c3p0-0.9.1.1.jar
new file mode 100644 (file)
index 0000000..8d283e4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/c3p0-0.9.1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-api-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-api-1.0.0.jar
new file mode 100644 (file)
index 0000000..d467063
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-api-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-bindings-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-bindings-1.0.0.jar
new file mode 100644 (file)
index 0000000..bc14a5e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-bindings-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-impl-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-impl-1.0.0.jar
new file mode 100644 (file)
index 0000000..aa95a39
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-client-impl-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-api-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-api-1.0.0.jar
new file mode 100644 (file)
index 0000000..c8fe4d6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-api-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-impl-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-impl-1.0.0.jar
new file mode 100644 (file)
index 0000000..88c682b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-commons-impl-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-bindings-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-bindings-1.0.0.jar
new file mode 100644 (file)
index 0000000..b6fe4f2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-bindings-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-support-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-support-1.0.0.jar
new file mode 100644 (file)
index 0000000..fb654a2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chemistry-opencmis-server-support-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-bytes-1.9.18.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-bytes-1.9.18.jar
new file mode 100644 (file)
index 0000000..f0c6487
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-bytes-1.9.18.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-core-1.9.19.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-core-1.9.19.jar
new file mode 100644 (file)
index 0000000..a9cf15f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-core-1.9.19.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-queue-4.6.44.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-queue-4.6.44.jar
new file mode 100644 (file)
index 0000000..1397968
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-queue-4.6.44.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-threads-1.9.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-threads-1.9.0.jar
new file mode 100644 (file)
index 0000000..1a4a7fb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-threads-1.9.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-wire-1.9.34.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-wire-1.9.34.jar
new file mode 100644 (file)
index 0000000..773bf70
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/chronicle-wire-1.9.34.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-beanutils-1.9.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-beanutils-1.9.3.jar
new file mode 100644 (file)
index 0000000..6728154
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-beanutils-1.9.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-cli-1.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-cli-1.4.jar
new file mode 100644 (file)
index 0000000..22deb30
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-cli-1.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-codec-1.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-codec-1.10.jar
new file mode 100644 (file)
index 0000000..1d7417c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-codec-1.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections-3.2.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections-3.2.2.jar
new file mode 100644 (file)
index 0000000..fa5df82
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections-3.2.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections4-4.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections4-4.1.jar
new file mode 100644 (file)
index 0000000..43a9413
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-collections4-4.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-csv-1.5.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-csv-1.5.jar
new file mode 100644 (file)
index 0000000..eb4775e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-csv-1.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-dbcp-1.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-dbcp-1.4.jar
new file mode 100644 (file)
index 0000000..c4c1c4f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-dbcp-1.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-digester-2.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-digester-2.1.jar
new file mode 100644 (file)
index 0000000..a07cfa8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-digester-2.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-fileupload-1.3.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-fileupload-1.3.3.jar
new file mode 100644 (file)
index 0000000..915d87e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-fileupload-1.3.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-io-2.5.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-io-2.5.jar
new file mode 100644 (file)
index 0000000..107b061
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-io-2.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-jexl-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-jexl-1.1.jar
new file mode 100644 (file)
index 0000000..be3a723
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-jexl-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool-1.5.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool-1.5.4.jar
new file mode 100644 (file)
index 0000000..43edf99
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool-1.5.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool2-2.4.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool2-2.4.2.jar
new file mode 100644 (file)
index 0000000..fdf8b6f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-pool2-2.4.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-text-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-text-1.1.jar
new file mode 100644 (file)
index 0000000..73fb4ae
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-text-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-validator-1.5.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-validator-1.5.1.jar
new file mode 100644 (file)
index 0000000..f90c695
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/commons-validator-1.5.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/compiler-0.9.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/compiler-0.9.3.jar
new file mode 100644 (file)
index 0000000..60cae63
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/compiler-0.9.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/connector-api-1.5.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/connector-api-1.5.jar
new file mode 100644 (file)
index 0000000..683762e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/connector-api-1.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/core-1.0-b02.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/core-1.0-b02.jar
new file mode 100644 (file)
index 0000000..21cc8c8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/core-1.0-b02.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cors-filter-2.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cors-filter-2.4.jar
new file mode 100644 (file)
index 0000000..24eda7b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cors-filter-2.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/curvesapi-1.04.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/curvesapi-1.04.jar
new file mode 100644 (file)
index 0000000..f097d0b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/curvesapi-1.04.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-core-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-core-3.1.3.jar
new file mode 100644 (file)
index 0000000..b434678
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-core-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-soap-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-soap-3.1.3.jar
new file mode 100644 (file)
index 0000000..c821915
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-soap-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-xml-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-xml-3.1.3.jar
new file mode 100644 (file)
index 0000000..4ed232f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-bindings-xml-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-databinding-jaxb-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-databinding-jaxb-3.1.3.jar
new file mode 100644 (file)
index 0000000..eca08cf
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-databinding-jaxb-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-jaxws-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-jaxws-3.1.3.jar
new file mode 100644 (file)
index 0000000..7a79828
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-jaxws-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-simple-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-simple-3.1.3.jar
new file mode 100644 (file)
index 0000000..d3a773b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-frontend-simple-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-transports-http-3.1.3-NX2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-transports-http-3.1.3-NX2.jar
new file mode 100644 (file)
index 0000000..f3bdcf9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-transports-http-3.1.3-NX2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-addr-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-addr-3.1.3.jar
new file mode 100644 (file)
index 0000000..8add3ff
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-addr-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-policy-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-policy-3.1.3.jar
new file mode 100644 (file)
index 0000000..83fd967
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-ws-policy-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-wsdl-3.1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-wsdl-3.1.3.jar
new file mode 100644 (file)
index 0000000..a78497b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/cxf-rt-wsdl-3.1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/dom4j-1.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/dom4j-1.6.1.jar
new file mode 100644 (file)
index 0000000..c8c4dbb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/dom4j-1.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ehcache-core-2.5.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ehcache-core-2.5.2.jar
new file mode 100644 (file)
index 0000000..a34b51e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ehcache-core-2.5.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-5.6.3.jar
new file mode 100644 (file)
index 0000000..86d0ba6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..5da3a9b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-high-level-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-high-level-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..3bbde96
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/elasticsearch-rest-high-level-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/expiringmap-0.5.8.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/expiringmap-0.5.8.jar
new file mode 100644 (file)
index 0000000..78acc41
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/expiringmap-0.5.8.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ezmorph-1.0.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ezmorph-1.0.4.jar
new file mode 100644 (file)
index 0000000..7625af6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ezmorph-1.0.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/failsafe-1.0.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/failsafe-1.0.1.jar
new file mode 100644 (file)
index 0000000..7c1b40a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/failsafe-1.0.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/flute-1.3.0.gg2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/flute-1.3.0.gg2.jar
new file mode 100644 (file)
index 0000000..b5af346
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/flute-1.3.0.gg2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/fontbox-1.8.16.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/fontbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..0ebc06b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/fontbox-1.8.16.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-connector-2.2.1-NX1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-connector-2.2.1-NX1.jar
new file mode 100644 (file)
index 0000000..b6478c1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-connector-2.2.1-NX1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-transaction-2.2.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-transaction-2.2.1.jar
new file mode 100644 (file)
index 0000000..4747c6c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/geronimo-transaction-2.2.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-1.19.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-1.19.0.jar
new file mode 100644 (file)
index 0000000..3204499
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-1.19.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-jackson-1.19.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-jackson-1.19.0.jar
new file mode 100644 (file)
index 0000000..393fd27
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-http-client-jackson-1.19.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-oauth-client-1.20.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-oauth-client-1.20.0.jar
new file mode 100644 (file)
index 0000000..0cd8575
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/google-oauth-client-1.20.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/groovy-all-2.4.12.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/groovy-all-2.4.12.jar
new file mode 100644 (file)
index 0000000..b255074
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/groovy-all-2.4.12.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guava-18.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guava-18.0.jar
new file mode 100644 (file)
index 0000000..8f89e49
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guava-18.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guice-3.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guice-3.0.jar
new file mode 100644 (file)
index 0000000..f313e2b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/guice-3.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-annotations-3.4.0.GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-annotations-3.4.0.GA.jar
new file mode 100644 (file)
index 0000000..24b1583
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-annotations-3.4.0.GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-commons-annotations-3.1.0.GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-commons-annotations-3.1.0.GA.jar
new file mode 100644 (file)
index 0000000..e0ca904
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-commons-annotations-3.1.0.GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-core-3.3.2.GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-core-3.3.2.GA.jar
new file mode 100644 (file)
index 0000000..eda14b7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-core-3.3.2.GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-entitymanager-3.4.0.GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-entitymanager-3.4.0.GA.jar
new file mode 100644 (file)
index 0000000..662eab1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hibernate-entitymanager-3.4.0.GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/howl-1.0.1-1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/howl-1.0.1-1.jar
new file mode 100644 (file)
index 0000000..b4ea5c6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/howl-1.0.1-1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hppc-0.7.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hppc-0.7.1.jar
new file mode 100644 (file)
index 0000000..ed318de
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hppc-0.7.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hsqldb-1.8.0.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hsqldb-1.8.0.1.jar
new file mode 100644 (file)
index 0000000..35436d6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/hsqldb-1.8.0.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpasyncclient-4.1.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpasyncclient-4.1.2.jar
new file mode 100644 (file)
index 0000000..20a8a5a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpasyncclient-4.1.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpclient-4.5.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpclient-4.5.3.jar
new file mode 100644 (file)
index 0000000..8af4561
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpclient-4.5.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-4.4.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-4.4.6.jar
new file mode 100644 (file)
index 0000000..16ed0d1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-4.4.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-nio-4.4.5.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-nio-4.4.5.jar
new file mode 100644 (file)
index 0000000..1845286
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/httpcore-nio-4.4.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/icu4j-51.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/icu4j-51.1.jar
new file mode 100644 (file)
index 0000000..4cecb9c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/icu4j-51.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/iri-0.8.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/iri-0.8.jar
new file mode 100644 (file)
index 0000000..f096c68
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/iri-0.8.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-annotations-2.7.9.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-annotations-2.7.9.jar
new file mode 100644 (file)
index 0000000..75ecb16
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-annotations-2.7.9.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-2.7.9.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-2.7.9.jar
new file mode 100644 (file)
index 0000000..e87c08a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-2.7.9.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-asl-1.8.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-asl-1.8.1.jar
new file mode 100644 (file)
index 0000000..13574a4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-core-asl-1.8.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-databind-2.7.9.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-databind-2.7.9.4.jar
new file mode 100644 (file)
index 0000000..a4ec29e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-databind-2.7.9.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-cbor-2.8.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-cbor-2.8.6.jar
new file mode 100644 (file)
index 0000000..07b028a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-cbor-2.8.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-smile-2.8.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-smile-2.8.6.jar
new file mode 100644 (file)
index 0000000..480f67f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-smile-2.8.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-yaml-2.8.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-yaml-2.8.6.jar
new file mode 100644 (file)
index 0000000..12386f6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-dataformat-yaml-2.8.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-jaxrs-1.9.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-jaxrs-1.9.2.jar
new file mode 100644 (file)
index 0000000..69f5b7f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-jaxrs-1.9.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-mapper-asl-1.8.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-mapper-asl-1.8.1.jar
new file mode 100644 (file)
index 0000000..83b6840
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-mapper-asl-1.8.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-xc-1.9.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-xc-1.9.2.jar
new file mode 100644 (file)
index 0000000..41f1070
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jackson-xc-1.9.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-cup-0.11a.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-cup-0.11a.jar
new file mode 100644 (file)
index 0000000..0954881
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-cup-0.11a.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-property-utils-1.9.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-property-utils-1.9.1.jar
new file mode 100644 (file)
index 0000000..4509552
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/java-property-utils-1.9.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javacc-4.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javacc-4.0.jar
new file mode 100644 (file)
index 0000000..38f8426
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javacc-4.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-core-2.5.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-core-2.5.0.jar
new file mode 100644 (file)
index 0000000..35dd8ea
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-core-2.5.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jdbc3-2.5.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jdbc3-2.5.0.jar
new file mode 100644 (file)
index 0000000..26644bc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jdbc3-2.5.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jmx-2.5.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jmx-2.5.0.jar
new file mode 100644 (file)
index 0000000..d6698ed
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javasimon-jmx-2.5.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javassist-3.21.0-GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javassist-3.21.0-GA.jar
new file mode 100644 (file)
index 0000000..64549c4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javassist-3.21.0-GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.inject-1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.inject-1.jar
new file mode 100644 (file)
index 0000000..b2a9d0b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.inject-1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.json-1.0.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.json-1.0.4.jar
new file mode 100644 (file)
index 0000000..09967d8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/javax.json-1.0.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-core-2.2.11.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-core-2.2.11.jar
new file mode 100644 (file)
index 0000000..f3c8412
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-core-2.2.11.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-impl-2.2.11.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-impl-2.2.11.jar
new file mode 100644 (file)
index 0000000..a5c5b23
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxb-impl-2.2.11.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxen-1.1.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxen-1.1.6.jar
new file mode 100644 (file)
index 0000000..52f47a4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jaxen-1.1.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jbig2-imageio-2.99.0-NX1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jbig2-imageio-2.99.0-NX1.jar
new file mode 100644 (file)
index 0000000..6e6d70d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jbig2-imageio-2.99.0-NX1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-el-1.0_02.CR6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-el-1.0_02.CR6.jar
new file mode 100644 (file)
index 0000000..b0c4c48
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-el-1.0_02.CR6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-seam-2.3.1.Final.NX03.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-seam-2.3.1.Final.NX03.jar
new file mode 100644 (file)
index 0000000..f637979
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jboss-seam-2.3.1.Final.NX03.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jcip-annotations-1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jcip-annotations-1.0.jar
new file mode 100644 (file)
index 0000000..06e9066
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jcip-annotations-1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jdbm-1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jdbm-1.0.jar
new file mode 100644 (file)
index 0000000..2b63ae5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jdbm-1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jedis-2.9.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jedis-2.9.0.jar
new file mode 100644 (file)
index 0000000..f4d27d3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jedis-2.9.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jempbox-1.8.16.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jempbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..edd06c5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jempbox-1.8.16.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jena-2.6.4-NX.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jena-2.6.4-NX.jar
new file mode 100644 (file)
index 0000000..6916a14
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jena-2.6.4-NX.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jericho-html-3.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jericho-html-3.2.jar
new file mode 100644 (file)
index 0000000..64b0750
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jericho-html-3.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-client-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-client-1.18.3.jar
new file mode 100644 (file)
index 0000000..04ca66e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-client-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-core-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-core-1.18.3.jar
new file mode 100644 (file)
index 0000000..c380e92
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-core-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-json-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-json-1.18.3.jar
new file mode 100644 (file)
index 0000000..125f11d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-json-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-multipart-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-multipart-1.18.3.jar
new file mode 100644 (file)
index 0000000..bfab818
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-multipart-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-server-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-server-1.18.3.jar
new file mode 100644 (file)
index 0000000..481b796
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-server-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-servlet-1.18.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-servlet-1.18.3.jar
new file mode 100644 (file)
index 0000000..4acfd66
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jersey-servlet-1.18.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jettison-1.3.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jettison-1.3.7.jar
new file mode 100644 (file)
index 0000000..56e2b01
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jettison-1.3.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jgrapht-core-1.0.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jgrapht-core-1.0.1.jar
new file mode 100644 (file)
index 0000000..51ced79
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jgrapht-core-1.0.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmd-0.8.1-tomasol-3e60e36137.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmd-0.8.1-tomasol-3e60e36137.jar
new file mode 100644 (file)
index 0000000..b01a321
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmd-0.8.1-tomasol-3e60e36137.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmimemagic-0.1.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmimemagic-0.1.2.jar
new file mode 100644 (file)
index 0000000..be2aa43
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jmimemagic-0.1.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-4.4.0-1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-4.4.0-1.jar
new file mode 100644 (file)
index 0000000..6757ad2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-4.4.0-1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-platform-4.4.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-platform-4.4.0.jar
new file mode 100644 (file)
index 0000000..ce54d8f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jna-platform-4.4.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/joda-time-2.8.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/joda-time-2.8.2.jar
new file mode 100644 (file)
index 0000000..05960ff
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/joda-time-2.8.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jodconverter-core-3.0-NX10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jodconverter-core-3.0-NX10.jar
new file mode 100644 (file)
index 0000000..81647a7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jodconverter-core-3.0-NX10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jolokia-core-1.3.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jolokia-core-1.3.3.jar
new file mode 100644 (file)
index 0000000..150d825
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jolokia-core-1.3.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jopt-simple-5.0.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jopt-simple-5.0.2.jar
new file mode 100644 (file)
index 0000000..2c7a087
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jopt-simple-5.0.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-20070829.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-20070829.jar
new file mode 100644 (file)
index 0000000..6ac8fb8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-20070829.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-lib-2.4-jdk15.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-lib-2.4-jdk15.jar
new file mode 100644 (file)
index 0000000..68d4f3b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-lib-2.4-jdk15.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-simple-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-simple-1.1.jar
new file mode 100644 (file)
index 0000000..f395f41
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/json-simple-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr250-api-1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr250-api-1.0.jar
new file mode 100644 (file)
index 0000000..c1f29bf
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr250-api-1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr305-1.3.9.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr305-1.3.9.jar
new file mode 100644 (file)
index 0000000..a9afc66
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jsr305-1.3.9.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jstl-1.1.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jstl-1.1.2.jar
new file mode 100644 (file)
index 0000000..a02abec
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jstl-1.1.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jta-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jta-1.1.jar
new file mode 100644 (file)
index 0000000..7736ec9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jta-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/juh-3.1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/juh-3.1.0.jar
new file mode 100644 (file)
index 0000000..2be97e3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/juh-3.1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jurt-3.1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jurt-3.1.0.jar
new file mode 100644 (file)
index 0000000..a7e2b1e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/jurt-3.1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka-clients-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka-clients-1.0.0.jar
new file mode 100644 (file)
index 0000000..a758b5b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka-clients-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka_2.11-1.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka_2.11-1.0.0.jar
new file mode 100644 (file)
index 0000000..ac7e771
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/kafka_2.11-1.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lang-mustache-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lang-mustache-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..46cc128
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lang-mustache-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-analyzers-common-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-analyzers-common-6.6.1.jar
new file mode 100644 (file)
index 0000000..e43d796
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-analyzers-common-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-backward-codecs-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-backward-codecs-6.6.1.jar
new file mode 100644 (file)
index 0000000..7275d1f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-backward-codecs-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-core-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-core-6.6.1.jar
new file mode 100644 (file)
index 0000000..9f68822
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-core-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-grouping-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-grouping-6.6.1.jar
new file mode 100644 (file)
index 0000000..7616f2e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-grouping-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-highlighter-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-highlighter-6.6.1.jar
new file mode 100644 (file)
index 0000000..776906e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-highlighter-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-join-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-join-6.6.1.jar
new file mode 100644 (file)
index 0000000..b9dc3ff
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-join-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-memory-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-memory-6.6.1.jar
new file mode 100644 (file)
index 0000000..d43401e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-memory-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-misc-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-misc-6.6.1.jar
new file mode 100644 (file)
index 0000000..728ca8e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-misc-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queries-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queries-6.6.1.jar
new file mode 100644 (file)
index 0000000..8f75af7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queries-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queryparser-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queryparser-6.6.1.jar
new file mode 100644 (file)
index 0000000..4ce539c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-queryparser-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-sandbox-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-sandbox-6.6.1.jar
new file mode 100644 (file)
index 0000000..973eb15
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-sandbox-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-6.6.1.jar
new file mode 100644 (file)
index 0000000..480efed
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-extras-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-extras-6.6.1.jar
new file mode 100644 (file)
index 0000000..9f8a0a2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial-extras-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial3d-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial3d-6.6.1.jar
new file mode 100644 (file)
index 0000000..51c79f2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-spatial3d-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-suggest-6.6.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-suggest-6.6.1.jar
new file mode 100644 (file)
index 0000000..f9546b7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lucene-suggest-6.6.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lz4-java-1.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lz4-java-1.4.jar
new file mode 100644 (file)
index 0000000..d561205
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/lz4-java-1.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-core-3.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-core-3.0.0.jar
new file mode 100644 (file)
index 0000000..2c5bdb6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-core-3.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-graphite-3.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-graphite-3.0.0.jar
new file mode 100644 (file)
index 0000000..db752f0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-graphite-3.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-jvm-3.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-jvm-3.0.0.jar
new file mode 100644 (file)
index 0000000..93201b8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-jvm-3.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-log4j-3.0.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-log4j-3.0.0.jar
new file mode 100644 (file)
index 0000000..27081f3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/metrics-log4j-3.0.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mimepull-1.9.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mimepull-1.9.3.jar
new file mode 100644 (file)
index 0000000..c323455
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mimepull-1.9.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mina-core-1.1.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mina-core-1.1.2.jar
new file mode 100644 (file)
index 0000000..a3ee379
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mina-core-1.1.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mvel2-2.2.4.FinalNX01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mvel2-2.2.4.FinalNX01.jar
new file mode 100644 (file)
index 0000000..8ef0f2c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/mvel2-2.2.4.FinalNX01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/neethi-3.0.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/neethi-3.0.3.jar
new file mode 100644 (file)
index 0000000..38b77ff
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/neethi-3.0.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nekohtml-1.9.22.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nekohtml-1.9.22.jar
new file mode 100644 (file)
index 0000000..6a2e782
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nekohtml-1.9.22.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-3.10.6.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-3.10.6.Final.jar
new file mode 100644 (file)
index 0000000..b0a1bda
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-3.10.6.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-buffer-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-buffer-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..540dde6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-buffer-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..e4f5aae
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-http-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-http-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..3a8a889
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-codec-http-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-common-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-common-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..c358a09
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-common-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-handler-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-handler-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..1b470a8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-handler-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-resolver-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-resolver-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..fc4509f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-resolver-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-transport-4.1.13.Final.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-transport-4.1.13.Final.jar
new file mode 100644 (file)
index 0000000..6bfc391
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/netty-transport-4.1.13.Final.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-core-storage-sql-extensions-9.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-core-storage-sql-extensions-9.10.jar
new file mode 100644 (file)
index 0000000..473fb06
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-core-storage-sql-extensions-9.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-stream-9.10-HF30.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-stream-9.10-HF30.jar
new file mode 100644 (file)
index 0000000..f2b2e74
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/nuxeo-stream-9.10-HF30.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-20090531.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-20090531.jar
new file mode 100644 (file)
index 0000000..c57d590
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-20090531.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-provider-20090531.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-provider-20090531.jar
new file mode 100644 (file)
index 0000000..9141460
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oauth-provider-20090531.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.core.jobs-3.5.0.v20100515.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.core.jobs-3.5.0.v20100515.jar
new file mode 100644 (file)
index 0000000..c145572
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.core.jobs-3.5.0.v20100515.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar
new file mode 100644 (file)
index 0000000..b9800a7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.p2.cudf-1.17-NX.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.p2.cudf-1.17-NX.jar
new file mode 100644 (file)
index 0000000..884c2d6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.eclipse.equinox.p2.cudf-1.17-NX.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.compendium-4.2.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.compendium-4.2.0.jar
new file mode 100644 (file)
index 0000000..93219d1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.compendium-4.2.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.core-4.2.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.core-4.2.0.jar
new file mode 100644 (file)
index 0000000..b986ac1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.osgi.core-4.2.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.restlet-1.0.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.restlet-1.0.7.jar
new file mode 100644 (file)
index 0000000..c86a22b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.restlet-1.0.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.core-2.3.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.core-2.3.1.jar
new file mode 100644 (file)
index 0000000..60db98d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.core-2.3.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.pb-2.3.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.pb-2.3.1.jar
new file mode 100644 (file)
index 0000000..03824bb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/org.sat4j.pb-2.3.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oro-2.0.8.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oro-2.0.8.jar
new file mode 100644 (file)
index 0000000..23488d2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/oro-2.0.8.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/parent-join-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/parent-join-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..50eff69
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/parent-join-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/pdfbox-1.8.16.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/pdfbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..d1e4c85
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/pdfbox-1.8.16.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/percolator-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/percolator-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..c4b290a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/percolator-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/persistence-api-1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/persistence-api-1.0.jar
new file mode 100644 (file)
index 0000000..fe5dbcd
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/persistence-api-1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/plexus-utils-1.5.6.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/plexus-utils-1.5.6.jar
new file mode 100644 (file)
index 0000000..ed6104e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/plexus-utils-1.5.6.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-3.17.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-3.17.jar
new file mode 100644 (file)
index 0000000..353ce76
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-3.17.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-3.17.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-3.17.jar
new file mode 100644 (file)
index 0000000..68086e8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-3.17.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-schemas-3.17.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-schemas-3.17.jar
new file mode 100644 (file)
index 0000000..2e9b3e7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-ooxml-schemas-3.17.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-scratchpad-3.17.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-scratchpad-3.17.jar
new file mode 100644 (file)
index 0000000..12ba1f1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/poi-scratchpad-3.17.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/quartz-2.2.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/quartz-2.2.3.jar
new file mode 100644 (file)
index 0000000..158c1c2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/quartz-2.2.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/reindex-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/reindex-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..24d4a71
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/reindex-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/relaxngDatatype-20020414.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/relaxngDatatype-20020414.jar
new file mode 100644 (file)
index 0000000..db9206f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/relaxngDatatype-20020414.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ridl-3.1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ridl-3.1.0.jar
new file mode 100644 (file)
index 0000000..df54a50
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/ridl-3.1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/sac-1.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/sac-1.3.jar
new file mode 100644 (file)
index 0000000..39b92b1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/sac-1.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/scala-library-2.11.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/scala-library-2.11.7.jar
new file mode 100644 (file)
index 0000000..3bd0710
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/scala-library-2.11.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/securesm-1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/securesm-1.1.jar
new file mode 100644 (file)
index 0000000..3e38947
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/securesm-1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-asn1-0.9.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-asn1-0.9.7.jar
new file mode 100644 (file)
index 0000000..bf5ba09
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-asn1-0.9.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-0.9.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-0.9.7.jar
new file mode 100644 (file)
index 0000000..4e61a4e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-0.9.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-constants-0.9.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-constants-0.9.7.jar
new file mode 100644 (file)
index 0000000..ac0c0bf
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/shared-ldap-constants-0.9.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snakeyaml-1.13.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snakeyaml-1.13.jar
new file mode 100644 (file)
index 0000000..453f99f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snakeyaml-1.13.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snappy-java-1.1.4.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snappy-java-1.1.4.jar
new file mode 100644 (file)
index 0000000..9e2c174
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/snappy-java-1.1.4.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax-api-1.0.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax-api-1.0.1.jar
new file mode 100644 (file)
index 0000000..d9a1665
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax-api-1.0.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax2-api-3.1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax2-api-3.1.1.jar
new file mode 100644 (file)
index 0000000..63a8a06
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stax2-api-3.1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stringtemplate-3.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stringtemplate-3.2.jar
new file mode 100644 (file)
index 0000000..8e41531
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/stringtemplate-3.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/t-digest-3.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/t-digest-3.0.jar
new file mode 100644 (file)
index 0000000..cfb29bc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/t-digest-3.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/taglibs-standard-impl-1.2.5.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/taglibs-standard-impl-1.2.5.jar
new file mode 100644 (file)
index 0000000..9176777
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/taglibs-standard-impl-1.2.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-jdbc-8.5.23.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-jdbc-8.5.23.jar
new file mode 100644 (file)
index 0000000..db2f32f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-jdbc-8.5.23.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-juli-8.5.23.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-juli-8.5.23.jar
new file mode 100644 (file)
index 0000000..8a61699
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tomcat-juli-8.5.23.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tranql-connector-1.8.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tranql-connector-1.8.jar
new file mode 100644 (file)
index 0000000..f6b82ec
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/tranql-connector-1.8.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-5.6.3.jar
new file mode 100644 (file)
index 0000000..9d75118
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty3-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty3-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..a8eaeb7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty3-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty4-client-5.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty4-client-5.6.3.jar
new file mode 100644 (file)
index 0000000..5cb4445
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/transport-netty4-client-5.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/unoil-3.1.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/unoil-3.1.0.jar
new file mode 100644 (file)
index 0000000..ff23e05
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/unoil-3.1.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/vaadin-sass-compiler-0.9.12-NX01.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/vaadin-sass-compiler-0.9.12-NX01.jar
new file mode 100644 (file)
index 0000000..bf85460
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/vaadin-sass-compiler-0.9.12-NX01.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/validation-api-1.0.0.GA.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/validation-api-1.0.0.GA.jar
new file mode 100644 (file)
index 0000000..1ff2dd7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/validation-api-1.0.0.GA.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/webdav-jaxrs-1.1.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/webdav-jaxrs-1.1.1.jar
new file mode 100644 (file)
index 0000000..ad1bb17
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/webdav-jaxrs-1.1.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wem-2.0.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wem-2.0.2.jar
new file mode 100644 (file)
index 0000000..c9ddd0f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wem-2.0.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/woodstox-core-asl-4.2.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/woodstox-core-asl-4.2.0.jar
new file mode 100644 (file)
index 0000000..8ca96d5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/woodstox-core-asl-4.2.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wro4j-core-1.7.7.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wro4j-core-1.7.7.jar
new file mode 100644 (file)
index 0000000..1f9430b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wro4j-core-1.7.7.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wsdl4j-1.6.3.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wsdl4j-1.6.3.jar
new file mode 100644 (file)
index 0000000..b9c10b9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/wsdl4j-1.6.3.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xbean-naming-3.18.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xbean-naming-3.18.jar
new file mode 100644 (file)
index 0000000..c6f933b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xbean-naming-3.18.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xml-resolver-1.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xml-resolver-1.2.jar
new file mode 100644 (file)
index 0000000..e535bdc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xml-resolver-1.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlbeans-2.6.0.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlbeans-2.6.0.jar
new file mode 100644 (file)
index 0000000..d1b6627
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlbeans-2.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlgraphics-commons-2.2.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlgraphics-commons-2.2.jar
new file mode 100644 (file)
index 0000000..d1813ff
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlgraphics-commons-2.2.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlschema-core-2.2.1.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlschema-core-2.2.1.jar
new file mode 100644 (file)
index 0000000..cab69fd
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xmlschema-core-2.2.1.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xpp3-1.1.4c-clean.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xpp3-1.1.4c-clean.jar
new file mode 100644 (file)
index 0000000..a2d74f7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xpp3-1.1.4c-clean.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xsom-20140925.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xsom-20140925.jar
new file mode 100644 (file)
index 0000000..f391598
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xsom-20140925.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xstream-1.4.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xstream-1.4.10.jar
new file mode 100644 (file)
index 0000000..4d7c5d0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/xstream-1.4.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zkclient-0.10.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zkclient-0.10.jar
new file mode 100644 (file)
index 0000000..b97c439
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zkclient-0.10.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zookeeper-3.5.3-beta.jar b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zookeeper-3.5.3-beta.jar
new file mode 100644 (file)
index 0000000..220087d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/lib/zookeeper-3.5.3-beta.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/plugins/README.txt b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/plugins/README.txt
new file mode 100644 (file)
index 0000000..4e594be
--- /dev/null
@@ -0,0 +1 @@
+This folder contains the external modules on top of the nuxeo platform
\ No newline at end of file
diff --git a/3rdparty/nuxeo/nuxeo-server/9.10-HF30/system.properties b/3rdparty/nuxeo/nuxeo-server/9.10-HF30/system.properties
new file mode 100644 (file)
index 0000000..7816123
--- /dev/null
@@ -0,0 +1 @@
+org.nuxeo.launcher.libdirs=lib
index 004c1d00c2cd8baa285e908396a881cc3720d09e..d8411270559b9ba5e2769112cbe5fb67886f9bf6 100644 (file)
@@ -5,7 +5,7 @@
         <groupId>org.collectionspace.services</groupId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.3rdparty</artifactId>
     <name>services.3rdparty</name>
@@ -14,7 +14,7 @@
     <modules>
         <module>nuxeo</module>
     </modules>
-    
+
     <dependencyManagement>
         <dependencies>
          </dependencies>
@@ -34,7 +34,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
--->        
+-->
     </build>
 
 </project>
index f9e3628258137ecca1b3ec71fa6f30ad2dc29f03..214f9a1f95539672e72c7d6aaf5939884eb15de1 100644 (file)
@@ -31,7 +31,7 @@ cspace.ui.webapp.name=cspaceUI
 cspace.ui.js=${cspace.ui.webapp.name}@${cspace.ui.version}.min.js
 
 #nuxeo
-nuxeo.release=7.10-HF17
+nuxeo.release=9.10-HF30
 nuxeo.ear=nuxeo.ear
 nuxeo.system=bundles
 
@@ -63,7 +63,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
 dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}
 
 #JEE Application Server
-jee.release=apache-tomcat-7.0.64
+jee.release=apache-tomcat-8.5.40
 jee.dir=${env.CSPACE_JEESERVER_HOME}
 jee.home=${jee.dir}
 jee.bin=${jee.home}/bin
index 7051f15571f910b23b6183f7e26d6f1ae63d0776..20be830062cc37218928504a1ede69364830818d 100644 (file)
@@ -52,7 +52,7 @@
                        <scope>provided</scope>
                        <version>4.7.2</version>
                </dependency>
-    
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -82,7 +82,7 @@
             <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- CollectionSpace dependencies -->        
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.service</artifactId>
                                        <artifactId>jsf-api</artifactId>
                                        <groupId>com.sun.faces</groupId>
                                </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-server</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-servlet</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-core</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
                                <exclusion>
                                        <artifactId>lucene-sandbox</artifactId>
                                        <groupId>org.apache.lucene</groupId>
                                        <groupId>com.sun.xml.bind</groupId>
                                </exclusion>
                        </exclusions>
-               </dependency>        
+               </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.account.service</artifactId>
                     <groupId>org.collectionspace.services</groupId>
                     <artifactId>org.collectionspace.services.authorization-mgt.import</artifactId>
                 </exclusion>
-            </exclusions> 
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.systeminfo.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>       
+        <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.media.service</artifactId>
             <version>${project.version}</version>
                </exclusion>
             </exclusions>
         </dependency>
-        
+
                <!-- AspectJ dependencies -->
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjweaver</artifactId>
                        <version>${aspectj.version}</version>
-               </dependency>        
+               </dependency>
 
         <!-- javax -->
         <dependency>
-                       <artifactId>servlet-api</artifactId>
-                       <groupId>javax.servlet</groupId>
-                       <scope>provided</scope>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>${tomcat.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- jboss -->
             <version>2.2.2.SP8</version>
             <scope>provided</scope>
         </dependency>
-        
-        <!-- nuxeo -->        
+
+        <!-- nuxeo -->
         <dependency>
             <groupId>org.nuxeo.common</groupId>
             <artifactId>nuxeo-common</artifactId>
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
-            </exclusions> 
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
         <dependency>
             <groupId>org.nuxeo.lib.core</groupId>
             <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
-                       <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-query</artifactId>
-                       <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
                                <version>5.5-NXP-8140</version>
                                need to use this patched Nuxeo artifact that is only available on our public Maven
                                repository -see http://nightly.collectionspace.org:8081/artifactory
-                               
+
                                Once the issue is resolved and a public version of the artifact becomes available, we
                                should revert this dependency's version to be the following:
                        <version>${nuxeo.core.version}</version>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-core</artifactId>
-                       <version>${nuxeo.core.version}</version>
+                       <version>${nuxeo.platform.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-audit-api</artifactId>
                        <version>${nuxeo.core.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>jersey-client</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                       </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.runtime</groupId>
             <artifactId>nuxeo-runtime-osgi</artifactId>
-                       <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>
         </dependency>
-               
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
                  <artifactId>qdox</artifactId>
                  <version>1.6.1</version>
                </dependency>
-               <!-- 
+               <!--
         <dependency>
                  <groupId>apache-xerces</groupId>
                  <artifactId>xml-apis</artifactId>
         </pluginManagement>
     </build>
 </project>
-
diff --git a/pom.xml b/pom.xml
index 7ccf44b9c16e1b8fbc517dd2fcc092d5164a699b..2a61907ca455325876a54d9317f29eaddb3ca01a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cspace.services.version>5.2-SNAPSHOT</cspace.services.version>
                <cspace.services.client.version>5.2-SNAPSHOT</cspace.services.client.version>
-               <nuxeo.general.release>7.10-HF17</nuxeo.general.release>
+               <nuxeo.general.release>9.10</nuxeo.general.release>
                <nuxeo.shell.version>${nuxeo.general.release}</nuxeo.shell.version>
                <nuxeo.platform.version>${nuxeo.general.release}</nuxeo.platform.version>
                <nuxeo.core.version>${nuxeo.general.release}</nuxeo.core.version>
 
                <repository>
                        <id>public-snapshot</id>
-                       <url>http://maven.nuxeo.org/public-snapshot</url>
+                       <url>https://maven-eu.nuxeo.org/nexus/content/repositories/public-snapshots</url>
                        <!-- Nuxeo Snapshots Repository is disabled. -->
                        <releases>
                                <enabled>false</enabled>
                        </releases>
                        <snapshots>
-                               <enabled>false</enabled>
                                <!--<updatePolicy>never</updatePolicy> -->
                        </snapshots>
                </repository>
 
                <repository>
                        <id>public</id>
-                       <url>http://maven.nuxeo.org/public</url>
+                       <url>https://maven-eu.nuxeo.org/nexus/content/repositories/public-releases</url>
+                       <!-- Nuxeo Releases Repository is disabled. -->
+                       <releases>
+                               <enabled>true</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
+
+               <repository>
+                       <id>vendor-releases</id>
+                       <url>https://maven-eu.nuxeo.org/nexus/content/repositories/vendor-releases</url>
                        <!-- Nuxeo Releases Repository is disabled. -->
                        <releases>
                                <enabled>true</enabled>
                                <version>3.0</version>
                                <scope>provided</scope>
                        </dependency>
+
+                       <!-- Start of Nuxeo dependencies -->
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.automation</groupId>
+                               <artifactId>nuxeo-automation-io</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-server</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-servlet</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-api</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-servlet</artifactId>
+                                       </exclusion>
+                                       <!-- <exclusion>
+                                                       <artifactId>jboss-remoting</artifactId>
+                                                       <groupId>jboss</groupId>
+                                       </exclusion> -->
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.common</groupId>
+                               <artifactId>nuxeo-common</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.platform</groupId>
+                               <artifactId>nuxeo-platform-imaging-core</artifactId>
+                               <version>${nuxeo.platform.version}</version>
+                               <scope>provided</scope>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-server</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-servlet</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-schema</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-storage-sql</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-storage-sql-ra</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-io</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-convert</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-opencmis-impl</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-server</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <artifactId>jersey-servlet</artifactId>
+                                               <groupId>com.sun.jersey</groupId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-opencmis-bindings</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime-jtajca</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime-datasource</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <!-- End of Nuxeo dependencies -->
+
+                       <!-- Tomcat -->
+                       <dependency>
+                               <groupId>org.apache.tomcat</groupId>
+                               <artifactId>tomcat-dbcp</artifactId>
+                               <version>${tomcat.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.tomcat</groupId>
+                               <artifactId>tomcat-catalina</artifactId>
+                               <version>${tomcat.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.tomcat</groupId>
+                               <artifactId>tomcat-servlet-api</artifactId>
+                               <version>${tomcat.version}</version>
+                               <scope>provided</scope>
+                       </dependency>
+
                </dependencies>
        </dependencyManagement>
 
index 0992a7ddcb73563f5eadd081fced1939fd9f9774..ec079f5abae6e749f19718644a51b9fd6f30be0b 100644 (file)
@@ -5,7 +5,7 @@
         <artifactId>org.collectionspace.services.main</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.IntegrationTests</artifactId>
     <name>services.IntegrationTests</name>
@@ -36,7 +36,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
@@ -76,7 +76,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.relation.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
 <!-- External dependencies -->
         <dependency>
                        <groupId>commons-cli</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-IntegrationTests</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 74c38ee2b600559e3cad4bb53153309b2751cd2d..8015b65c596dd3ca7ccb29925b8328d990f46ac6 100644 (file)
@@ -52,7 +52,7 @@
                        <scope>provided</scope>
                        <version>4.7.2</version>
                </dependency>
-    
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -82,7 +82,7 @@
             <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- CollectionSpace dependencies -->        
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.service</artifactId>
                                        <artifactId>jsf-api</artifactId>
                                        <groupId>com.sun.faces</groupId>
                                </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-server</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-servlet</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                               <exclusion>
-                                       <artifactId>jersey-core</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
                                <exclusion>
                                        <artifactId>lucene-sandbox</artifactId>
                                        <groupId>org.apache.lucene</groupId>
                                        <groupId>com.sun.xml.bind</groupId>
                                </exclusion>
                        </exclusions>
-               </dependency>        
+               </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.account.service</artifactId>
                     <groupId>org.collectionspace.services</groupId>
                     <artifactId>org.collectionspace.services.authorization-mgt.import</artifactId>
                 </exclusion>
-            </exclusions> 
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.systeminfo.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>       
+        <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.media.service</artifactId>
             <version>${project.version}</version>
                </exclusion>
             </exclusions>
         </dependency>
-        
+
                <!-- AspectJ dependencies -->
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjweaver</artifactId>
                        <version>${aspectj.version}</version>
-               </dependency>        
+               </dependency>
 
         <!-- javax -->
         <dependency>
-                       <artifactId>servlet-api</artifactId>
-                       <groupId>javax.servlet</groupId>
+                       <groupId>org.apache.tomcat</groupId>
+                       <artifactId>tomcat-servlet-api</artifactId>
+                       <version>${tomcat.version}</version>
                        <scope>provided</scope>
         </dependency>
 
             <version>2.2.2.SP8</version>
             <scope>provided</scope>
         </dependency>
-        
-        <!-- nuxeo -->        
+
+        <!-- nuxeo -->
         <dependency>
             <groupId>org.nuxeo.common</groupId>
             <artifactId>nuxeo-common</artifactId>
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
-            </exclusions> 
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-convert</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.nuxeo.lib.core</groupId>
-            <artifactId>nuxeo-core-storage-sql-extensions</artifactId>
-                       <version>${nuxeo.core.version}</version>            
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-storage-sql-ra</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-query</artifactId>
-                       <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
                                <version>5.5-NXP-8140</version>
                                need to use this patched Nuxeo artifact that is only available on our public Maven
                                repository -see http://nightly.collectionspace.org:8081/artifactory
-                               
+
                                Once the issue is resolved and a public version of the artifact becomes available, we
                                should revert this dependency's version to be the following:
                        <version>${nuxeo.core.version}</version>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-core</artifactId>
-                       <version>${nuxeo.core.version}</version>
+                       <version>${nuxeo.platform.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-audit-api</artifactId>
                        <version>${nuxeo.core.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>jersey-client</artifactId>
-                                       <groupId>com.sun.jersey</groupId>
-                               </exclusion>
-                       </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.runtime</groupId>
             <artifactId>nuxeo-runtime-osgi</artifactId>
-                       <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>
         </dependency>
-               
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
                  <artifactId>qdox</artifactId>
                  <version>1.6.1</version>
                </dependency>
-               <!-- 
+               <!--
         <dependency>
                  <groupId>apache-xerces</groupId>
                  <artifactId>xml-apis</artifactId>
         </pluginManagement>
     </build>
 </project>
-
index 724233b94bf0f50a0a5ff75675e170f358b1e658..4cdf658f8606b409f0577205e511f6928509fbd6 100644 (file)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to You under 
-  the Apache License, Version 2.0 (the "License"); you may not use this file except 
-  in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
-  Unless required by applicable law or agreed to in writing, software distributed under 
-  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific language 
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+  license agreements. See the NOTICE file distributed with this work for additional
+  information regarding copyright ownership. The ASF licenses this file to You under
+  the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software distributed under
+  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+  OF ANY KIND, either express or implied. See the License for the specific language
   governing permissions and limitations under the License. -->
 <Context antiResourceLocking="false" privileged="true" path="/cspace-services"
     docBase="cspace-services">
 
     <!-- define custom loader that is responsible to start nuxeo runtime (it extends the default one) -->
 
-    <!-- Disabled since these are specific to the default Nuxeo DM webapp      
+    <!-- Disabled since these are specific to the default Nuxeo DM webapp
   <Loader className="org.nuxeo.runtime.tomcat.NuxeoWebappLoader"
     loaderClass="org.nuxeo.runtime.tomcat.NuxeoWebappClassLoader" />
-    
+
   <Listener className="org.nuxeo.runtime.tomcat.NuxeoLauncher" home="${catalina.base}/nxserver" />
   -->
 
@@ -27,7 +27,7 @@
     For example java:comp/env/jdbc/nxsqldirectory This means you need to update corresponding
     JNDI bindings in nuxeo data source definitions in the config directory -->
 
-<!-- 
+<!--
     <ResourceLink name="jdbc/nxsqldirectory" global="jdbc/nuxeo" type="javax.sql.DataSource"/>
     <ResourceLink name="jdbc/nxrelations-default-jena" global="jdbc/nuxeo" type="javax.sql.DataSource"/>
     <ResourceLink name="jdbc/comment-relations" global="jdbc/nuxeo" type="javax.sql.DataSource"/>
 
   <Listener className="org.nuxeo.runtime.tomcat.ContextSecurityGrabber" />
 
-<!-- 
+<!--
     <Resource name="TransactionManager" auth="Container" type="javax.transaction.TransactionManager"
         factory="org.nuxeo.runtime.jtajca.NuxeoTransactionManagerFactory"
         transactionTimeoutSeconds="300"/>
     <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory"/>
-    
+
     <Resource name="NuxeoConnectionManager" auth="Container"
         type="javax.resource.spi.ConnectionManager"
         factory="org.nuxeo.runtime.jtajca.NuxeoConnectionManagerFactory" minPoolSize="0"
     transactionTimeoutSeconds="300" />
   <Transaction factory="org.nuxeo.runtime.jtajca.NuxeoUserTransactionFactory" />
 
-    <!-- 
+    <!--
                For CollectionSpace services
         -->
-        
+
        <Resource name="jdbc/CspaceDS"
                auth="Container"
                type="javax.sql.DataSource"
                password="${db.cspace.user.password}"
                driverClassName="${db.jdbc.driver.class}"
                url="${db.jdbc.cspace.url.encoded}"
-               maxActive="8"
+               maxTotal="8"
                maxIdle="4"
                testWhileIdle="true"
                validationQuery="SELECT 1"
                logAbandoned="true"/>
-               
+
        <Resource name="jdbc/NuxeoDS_CS"
                auth="Container"
                type="javax.sql.DataSource"
@@ -87,7 +87,7 @@
                password="${db.nuxeo.user.password}"
                driverClassName="${db.jdbc.driver.class}"
                url="${db.jdbc.nuxeo.url.encoded}"
-               maxActive="8"
+               maxTotal="8"
                maxIdle="4"
                testWhileIdle="true"
                validationQuery="SELECT 1"
                password="${db.csadmin.user.password}"
                driverClassName="${db.jdbc.driver.class}"
                url="${db.jdbc.csadmin.url.encoded}"
-               maxActive="8"
+               maxTotal="8"
                maxIdle="4"
                testWhileIdle="true"
                validationQuery="SELECT 1"
                logAbandoned="true"/>
-  
+
   <Resource name="jdbc/NuxeoReaderDS"
                auth="Container"
                type="javax.sql.DataSource"
                password="${db.reader.user.password}"
                driverClassName="${db.jdbc.driver.class}"
                url="${db.jdbc.nuxeo.url.encoded}"
-               maxActive="8"
+               maxTotal="8"
                maxIdle="4"
                testWhileIdle="true"
                validationQuery="SELECT 1"
index 1f962afcce7c9720f13c67509dec6b4b921f55db..655295d9e2d8610556c945de7f473be53a919661 100644 (file)
@@ -5,7 +5,7 @@
         <groupId>org.collectionspace.services</groupId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.PerformanceTests</artifactId>
     <packaging>jar</packaging>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -91,7 +84,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-PerformanceTests</finalName>
         <plugins>
                        </build>
                </profile>
        </profiles>
-    
-</project>
 
+</project>
index ed968453d04ece5d8e2fa087fd7aca3a9540dd60..1c726d8da428aa9ffeb2904cba89eb235d534886 100644 (file)
@@ -33,7 +33,7 @@
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.hyperjaxb</artifactId>
                        <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
                                <filtering>true</filtering>
                        </resource>
                </resources>
-               
+
     </build>
 
 </project>
-
index 055de44b4a9740d5fb93320bbd2c3e934f8f5732..89ae473322af7a124e10a947448924e9f57e0899 100644 (file)
@@ -22,9 +22,9 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- CollectionSpace Dependencies -->
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
                        <artifactId>org.collectionspace.services.authentication.service</artifactId>
                        <version>${project.version}</version>
                        <scope>provided</scope>
-               </dependency>        
+               </dependency>
 
         <!-- External dependencies -->
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
         </plugins>
     </build>
 </project>
-
index ef4ece89bdf8bff92b1970b04fb08b7457993726..26d6b1ee6027df7bc2046c5398e2d492ce948944 100644 (file)
@@ -12,7 +12,7 @@
     <artifactId>org.collectionspace.services.acquisition.client</artifactId>
     <name>services.acquisition.client</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -31,7 +31,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -80,7 +74,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-acquisition-client</finalName>
         <plugins>
@@ -99,4 +93,3 @@
         </plugins>
     </build>
 </project>
-
index 34ccf89783f28631e8c0d97c6d3bf4b34472decd..bccb945bc2ca46db38a990fc57c910a0002bc3cf 100644 (file)
@@ -5,7 +5,7 @@
         <artifactId>org.collectionspace.services.authentication</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.authentication.service</artifactId>
     <name>services.authentication.service</name>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-catalina</artifactId>
-                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-dbcp</artifactId>
-                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
         <dependency>
@@ -82,7 +80,7 @@
                  <groupId>org.jboss.security</groupId>
                  <artifactId>jbosssx</artifactId>
             <scope>provided</scope>
-                       <version>2.0.3.SP1</version>            
+                       <version>2.0.3.SP1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
         <finalName>cspace-services-authn</finalName>
     </build>
 </project>
-
index ebb71a9341998d46f15ae23813f56d43aa88b0ab..3c06fa63fb824a99f3b11e3ced62f99df204637f 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.collectionspace.services</groupId>
@@ -33,8 +33,9 @@
 
         <!-- javax -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>${tomcat.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
        <modules>
         <module>jaxb</module>
         <module>service</module>
     </modules>
-       
-       </project>
 
+       </project>
index 34e050c23cf348d9126669b58b5ec63aadbab8ee..b15469aabb115d25e4ec1867e5feda55c6d916da 100644 (file)
@@ -43,7 +43,7 @@
                        <groupId>org.collectionspace.services</groupId>
                    <artifactId>org.collectionspace.services.vocabulary.client</artifactId>
                        <version>${project.version}</version>
-               </dependency>           
+               </dependency>
                <dependency>
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.common</artifactId>
 
                <!-- javax -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <groupId>org.apache.tomcat</groupId>
+                       <artifactId>tomcat-servlet-api</artifactId>
+                       <version>${tomcat.version}</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jaxrs</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>tjws</groupId>
-                                       <artifactId>webserver</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-core</artifactId>
                        <version>${nuxeo.platform.version}</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-api</artifactId>
                        <version>${nuxeo.platform.version}</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql</artifactId>
                </dependency>
-               <!-- 
+               <!--
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-io</artifactId>
                </dependency>
        </dependencies>
 </project>
-
index 326aeb3f2a5cfd12ecac3757496f741cc2a8172d..04cc871f4b46ff6d04ec8d90f8db3c118f456fa0 100644 (file)
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>
         </dependency>
-        <!-- 
+        <!--
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
     </build>
 
 </project>
-
index fa860f4e972820a25e8f931fe221c1823a3c426c..dc8b622169f87bddda158d9bd8fc43ca849c5d11 100644 (file)
                        <version>1.0</version>
                        <scope>provided</scope>
                </dependency>
-               <!--dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> 
+               <!--dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
                        <version>${spring.version}</version> <scope>provided</scope> </dependency -->
                <dependency>
                        <groupId>org.jboss.security</groupId>
                                        <groupId>commons-codec</groupId>
                                        <artifactId>commons-codec</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>xml-apis</groupId>
+                                       <artifactId>xml-apis</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
                                        </systemProperties>
                                </configuration>
                                <dependencies>
-                                       <!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> 
+                                       <!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId>
                                                <version>${mysql.driver.version}</version> </dependency> -->
                                        <dependency>
                                                <groupId>org.postgresql</groupId>
                </plugins>
        </build>
 </project>
-
index d9e3335e5ede72d3fa51b9bba0a9bed07a40573b..504bf2fcf23fcb357dfca766bfb4e54d2c4da5c3 100644 (file)
@@ -26,7 +26,7 @@
 
         <!-- utilities -->
 
-        <!-- slf4j not available due to classloading issues running in system classpath 
+        <!-- slf4j not available due to classloading issues running in system classpath
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>org.collectionspace.services.authentication.service</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
index 99166280b4c32d21eccac8dc0e03a3c3bce5aa43..5a18aa3c876500670e466bded3ad51a276af4078 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.batch.client</artifactId>
     <name>services.batch.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-batch-client</finalName>
     </build>
index b019b3b9def64a567a595b2ddcc02c39cb22bc13..ad5073e9408f4418693aadacd231227d21274806 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.batch</artifactId>        
+        <artifactId>org.collectionspace.services.batch</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.batch.service</artifactId>
     <name>services.batch.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -43,7 +43,7 @@
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.authorization.service</artifactId>
                        <version>${project.version}</version>
-               </dependency>        
+               </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <artifactId>org.collectionspace.services.taxonomy.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
             <version>1.0</version>
-            <scope>provided</scope>        
+            <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-batch</finalName>
     </build>
 </project>
-
index 4a2df3a6ceb06ac3e57e4a4dcc6c80e38cd5a918..ece795a6fe70338c6d2929df37d64edbd77b8ee8 100644 (file)
@@ -12,6 +12,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
+
 import org.collectionspace.services.client.PayloadOutputPart;
 import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.client.RelationClient;
@@ -32,7 +34,6 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.Node;
 
-import org.nuxeo.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,12 +51,12 @@ import org.slf4j.LoggerFactory;
  * emitted and no action is taken. If a source is successfully merged into the
  * target, all references to the source are transferred to the target, and the
  * source record is soft-deleted.
- * 
+ *
  * The context (singleCSID or listCSIDs of the batch invocation payload
  * specifies the source record(s).
- * 
+ *
  * The following parameters are allowed:
- * 
+ *
  * targetCSID: The csid of the target record. Only one target may be supplied.
  *
  * @author ray
@@ -75,15 +76,15 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        String docType = null;
                        String targetCsid = null;
                        List<String> sourceCsids = new ArrayList<String>();
-                       
+
                        for (Param param : this.getParams()) {
                                String key = param.getKey();
-                               
+
                                // I don't want this batch job to appear in the UI, since it won't run successfully without parameters.
                                // That means it can't be registered with any docType. But if the invocation payload contains a docType,
                                // it will be checked against the null registered docType, and will fail. So docType should be passed as a
                                // parameter instead.
-                               
+
                                if (key.equals("docType")) {
                                        docType = param.getValue();
                                }
@@ -102,11 +103,11 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        if (targetCsid == null || targetCsid.equals("")) {
                                throw new Exception("a target csid parameter (targetCSID) must be supplied");
                        }
-                       
+
                        if (sourceCsids.size() == 0) {
                                throw new Exception("a source csid must be supplied");
                        }
-                       
+
                        InvocationResults results = merge(docType, targetCsid, sourceCsids);
 
                        setResults(results);
@@ -121,12 +122,12 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
        public InvocationResults merge(String docType, String targetCsid, String sourceCsid) throws URISyntaxException, DocumentException {
                return merge(docType, targetCsid, Arrays.asList(sourceCsid));
        }
-       
+
        public InvocationResults merge(String docType, String targetCsid, List<String> sourceCsids) throws URISyntaxException, DocumentException {
                logger.debug("Merging docType=" + docType + " targetCsid=" + targetCsid + " sourceCsids=" + StringUtils.join(sourceCsids, ","));
-               
+
                String serviceName = getAuthorityServiceNameForDocType(docType);
-               
+
                PoxPayloadOut targetItemPayload = findAuthorityItemByCsid(serviceName, targetCsid);
                List<PoxPayloadOut> sourceItemPayloads = new ArrayList<PoxPayloadOut>();
 
@@ -136,7 +137,7 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
 
                return merge(docType, targetItemPayload, sourceItemPayloads);
        }
-       
+
        private InvocationResults merge(String docType, PoxPayloadOut targetItemPayload, List<PoxPayloadOut> sourceItemPayloads) throws URISyntaxException, DocumentException {
                int numAffected = 0;
                List<String> userNotes = new ArrayList<String>();
@@ -147,15 +148,15 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                String targetCsid = getCsid(targetItemPayload);
                String targetRefName = getRefName(targetItemPayload);
                String inAuthority = getFieldValue(targetItemPayload, "inAuthority");
-                       
+
                logger.debug("Merging term groups");
-               
+
                for (PoxPayloadOut sourceItemPayload : sourceItemPayloads) {
                        String sourceCsid = getCsid(sourceItemPayload);
                        Element sourceTermGroupListElement = getTermGroupListElement(sourceItemPayload);
-                       
+
                        logger.debug("Merging term groups from source " + sourceCsid + " into target " + targetCsid);
-                       
+
                        try {
                                mergeTermGroupLists(mergedTermGroupListElement, sourceTermGroupListElement);
                        }
@@ -163,104 +164,104 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                                throw new RuntimeException("Error merging source record " + sourceCsid + " into target record " + targetCsid + ": " + e.getMessage(), e);
                        }
                }
-               
+
                logger.debug("Updating target: docType=" + docType + " inAuthority=" + inAuthority + " targetCsid=" + targetCsid);
-               
+
                updateAuthorityItem(docType, inAuthority, targetCsid, getUpdatePayload(targetTermGroupListElement, mergedTermGroupListElement));
-               
+
                userNotes.add("The target record with CSID " + targetCsid + " (" + targetRefName + ") was updated.");
                numAffected++;
-               
+
                String serviceName = getAuthorityServiceNameForDocType(docType);
 
                logger.debug("Updating references");
-               
+
                for (PoxPayloadOut sourceItemPayload : sourceItemPayloads) {
                        String sourceCsid = getCsid(sourceItemPayload);
                        String sourceRefName = getRefName(sourceItemPayload);
-                       
+
                        InvocationResults results = updateReferences(serviceName, inAuthority, sourceCsid, sourceRefName, targetRefName);
-                       
+
                        userNotes.add(results.getUserNote());
                        numAffected += results.getNumAffected();
                }
-               
+
                logger.debug("Deleting source items");
-               
+
                for (PoxPayloadOut sourceItemPayload : sourceItemPayloads) {
                        String sourceCsid = getCsid(sourceItemPayload);
                        String sourceRefName = getRefName(sourceItemPayload);
 
                        InvocationResults results = deleteAuthorityItem(docType, getFieldValue(sourceItemPayload, "inAuthority"), sourceCsid);
-                       
+
                        userNotes.add(results.getUserNote());
                        numAffected += results.getNumAffected();
                }
-               
+
                InvocationResults results = new InvocationResults();
                results.setNumAffected(numAffected);
                results.setUserNote(StringUtils.join(userNotes, "\n"));
 
                return results;
        }
-       
+
        private InvocationResults updateReferences(String serviceName, String inAuthority, String sourceCsid, String sourceRefName, String targetRefName) throws URISyntaxException, DocumentException {
                logger.debug("Updating references: serviceName=" + serviceName + " inAuthority=" + inAuthority + " sourceCsid=" + sourceCsid + " sourceRefName=" + sourceRefName + " targetRefName=" + targetRefName);
-               
+
                int pageNum = 0;
                int pageSize = 100;
                List<AuthorityRefDocList.AuthorityRefDocItem> items;
-               
+
                int loopCount = 0;
                int numUpdated = 0;
-               
+
                logger.debug("Looping with pageSize=" + pageSize);
-               
+
                do {
                        loopCount++;
-                       
+
                        // The pageNum/pageSize parameters don't work properly for refobj requests!
                        // It should be safe to repeatedly fetch page 0 for a large-ish page size,
                        // and update that page, until no references are left.
-                       
+
                        items = findReferencingFields(serviceName, inAuthority, sourceCsid, null, pageNum, pageSize);
                        Map<String, ReferencingRecord> referencingRecordsByCsid = new LinkedHashMap<String, ReferencingRecord>();
-                       
+
                        logger.debug("Loop " + loopCount + ": " + items.size() + " items found");
-                       
+
                        for (AuthorityRefDocList.AuthorityRefDocItem item : items) {
                                // If a record contains a reference to the record multiple times, multiple items are returned,
                                // but only the first has a non-null workflow state. A bug?
-                               
+
                                String itemCsid = item.getDocId();
                                ReferencingRecord record = referencingRecordsByCsid.get(itemCsid);
-                               
+
                                if (record == null) {
                                        if (item.getWorkflowState() != null && !item.getWorkflowState().equals(WorkflowClient.WORKFLOWSTATE_DELETED)) {
                                                record = new ReferencingRecord(item.getUri());
                                                referencingRecordsByCsid.put(itemCsid, record);
                                        }
                                }
-                               
+
                                if (record != null) {
                                        String[] sourceFieldElements = item.getSourceField().split(":");
                                        String partName = sourceFieldElements[0];
                                        String fieldName = sourceFieldElements[1];
-                                       
+
                                        Map<String, Set<String>> fields = record.getFields();
                                        Set<String> fieldsInPart = fields.get(partName);
-                                                       
+
                                        if (fieldsInPart == null) {
                                                fieldsInPart = new HashSet<String>();
                                                fields.put(partName, fieldsInPart);
                                        }
-                                       
+
                                        fieldsInPart.add(fieldName);
                                }
                        }
-                       
+
                        List<ReferencingRecord> referencingRecords = new ArrayList<ReferencingRecord>(referencingRecordsByCsid.values());
-                       
+
                        logger.debug("Loop " + loopCount + ": updating " + referencingRecords.size() + " records");
 
                        for (ReferencingRecord record : referencingRecords) {
@@ -269,40 +270,40 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        }
                }
                while (items.size() > 0);
-               
+
                InvocationResults results = new InvocationResults();
                results.setNumAffected(numUpdated);
-               results.setUserNote(numUpdated > 0 ? 
+               results.setUserNote(numUpdated > 0 ?
                                numUpdated + " records that referenced the source record with CSID " + sourceCsid + " were updated." :
                                "No records referenced the source record with CSID " + sourceCsid + ".");
-               
+
                return results;
        }
-       
+
        private InvocationResults updateReferencingRecord(ReferencingRecord record, String fromRefName, String toRefName) throws URISyntaxException, DocumentException {
                String fromRefNameStem = RefNameUtils.stripAuthorityTermDisplayName(fromRefName);
                // String toRefNameStem = RefNameUtils.stripAuthorityTermDisplayName(toRefName);
-               
+
                logger.debug("Updating references: record.uri=" + record.getUri() + " fromRefName=" + fromRefName + " toRefName=" + toRefName);
-               
+
                Map<String, Set<String>> fields = record.getFields();
-               
+
                PoxPayloadOut recordPayload = findByUri(record.getUri());
                Document recordDocument = recordPayload.getDOMDocument();
                Document newDocument = (Document) recordDocument.clone();
                Element rootElement = newDocument.getRootElement();
-               
+
                for (Element partElement : (List<Element>) rootElement.elements()) {
                        String partName = partElement.getName();
-                       
+
                        if (fields.containsKey(partName)) {
                                for (String fieldName : fields.get(partName)) {
                                        List<Node> nodes = partElement.selectNodes("descendant::" + fieldName);
-                                       
+
                                        for (Node node : nodes) {
                                                String text = node.getText();
                                                String refNameStem = null;
-                                               
+
                                                try {
                                                        refNameStem = RefNameUtils.stripAuthorityTermDisplayName(text);
                                                }
@@ -312,7 +313,7 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                                                        AuthorityTermInfo termInfo = RefNameUtils.parseAuthorityTermInfo(text);
                                                        // String newRefName = toRefNameStem + "'" + termInfo.displayName + "'";
                                                        String newRefName = toRefName;
-                                                       
+
                                                        node.setText(newRefName);
                                                }
                                        }
@@ -322,21 +323,21 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                                rootElement.remove(partElement);
                        }
                }
-               
+
                String payload = newDocument.asXML();
-               
+
                return updateUri(record.getUri(), payload);
        }
-       
+
        private InvocationResults updateUri(String uri, String payload) throws URISyntaxException {
                String[] uriParts = uri.split("/");
-               
+
                if (uriParts.length == 3) {
                        String serviceName = uriParts[1];
                        String csid = uriParts[2];
-               
+
                        NuxeoBasedResource resource = (NuxeoBasedResource) getResourceMap().get(serviceName);
-                       
+
                        resource.update(getResourceMap(), createUriInfo(), csid, payload);
                }
                else if (uriParts.length == 5) {
@@ -344,86 +345,86 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        String vocabularyCsid = uriParts[2];
                        String items = uriParts[3];
                        String csid = uriParts[4];
-                       
+
                        if (items.equals("items")) {
                                AuthorityResource<?, ?> resource = (AuthorityResource<?, ?>) getResourceMap().get(serviceName);
-                               
+
                                resource.updateAuthorityItem(getResourceMap(), createUriInfo(), vocabularyCsid, csid, payload);
                        }
                }
                else {
                        throw new IllegalArgumentException("Invalid uri " + uri);
                }
-               
+
                logger.debug("Updated referencing record " + uri);
-               
+
                InvocationResults results = new InvocationResults();
                results.setNumAffected(1);
                results.setUserNote("Updated referencing record " + uri);
-       
+
                return results;
        }
-       
+
        private void updateAuthorityItem(String docType, String inAuthority, String csid, String payload) throws URISyntaxException {
                String serviceName = getAuthorityServiceNameForDocType(docType);
                AuthorityResource<?, ?> resource = (AuthorityResource<?, ?>) getResourceMap().get(serviceName);
-               
+
                resource.updateAuthorityItem(getResourceMap(), createUriInfo(), inAuthority, csid, payload);
        }
-       
+
        private InvocationResults deleteAuthorityItem(String docType, String inAuthority, String csid) throws URISyntaxException {
                int numAffected = 0;
                List<String> userNotes = new ArrayList<String>();
-               
+
                // If the item is the broader context of any items, warn and do nothing.
-               
+
                List<String> narrowerItemCsids = findNarrower(csid);
-               
+
                if (narrowerItemCsids.size() > 0) {
                        logger.debug("Item " + csid + " has narrower items -- not deleting");
-                       
+
                        userNotes.add("The source record with CSID " + csid + " was not deleted because it has narrower context items.");
                }
                else {
                        // If the item has a broader context, delete the relation.
-                       
+
                        List<String> relationCsids = new ArrayList<String>();
 
                        for (RelationsCommonList.RelationListItem item : findRelated(csid, null, "hasBroader", null, null)) {
                                relationCsids.add(item.getCsid());
                        }
-                       
+
                        if (relationCsids.size() > 0) {
                                RelationResource relationResource = (RelationResource) getResourceMap().get(RelationClient.SERVICE_NAME);
 
                                for (String relationCsid : relationCsids) {
                                        logger.debug("Deleting hasBroader relation " + relationCsid);
-                                       
+
                                        relationResource.delete(relationCsid);
-                                       
+
                                        userNotes.add("The broader relation with CSID " + relationCsid + " was deleted.");
                                        numAffected++;
                                }
                        }
-                       
+
                        String serviceName = getAuthorityServiceNameForDocType(docType);
                        AuthorityResource<?, ?> resource = (AuthorityResource<?, ?>) getResourceMap().get(serviceName);
 
                        logger.debug("Soft deleting: docType=" + docType + " inAuthority=" + inAuthority + " csid=" + csid);
 
                        resource.updateItemWorkflowWithTransition(null, inAuthority, csid, "delete");
-                       
+
                        userNotes.add("The source record with CSID " + csid + " was soft deleted.");
                        numAffected++;
                }
-               
+
                InvocationResults results = new InvocationResults();
                results.setNumAffected(numAffected);
                results.setUserNote(StringUtils.join(userNotes, "\n"));
-               
+
                return results;
        }
-       
+
        /**
         * @param Returns a map of the term groups in term group list, keyed by display name.
         *        If multiple groups have the same display name, an exception is thrown.
@@ -432,48 +433,48 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
        private Map<String, Element> getTermGroups(Element termGroupListElement) {
                Map<String, Element> termGroups = new LinkedHashMap<String, Element>();
                Iterator<Element> childIterator = termGroupListElement.elementIterator();
-               
+
                while (childIterator.hasNext()) {
                        Element termGroupElement = childIterator.next();
                        String displayName = getDisplayName(termGroupElement);
-                       
+
                        if (termGroups.containsKey(displayName)) {
                                // Two term groups in the same item have identical display names.
-                               
+
                                throw new RuntimeException("multiple terms have display name \"" + displayName + "\"");
                        }
                        else {
                                termGroups.put(displayName, termGroupElement);
                        }
                }
-               
+
                return termGroups;
        }
-       
+
        private String getDisplayName(Element termGroupElement) {
                Node displayNameNode = termGroupElement.selectSingleNode("termDisplayName");
                String displayName = (displayNameNode == null) ? "" : displayNameNode.getText();
-               
+
                return displayName;
        }
-       
+
        private Element getTermGroupListElement(PoxPayloadOut itemPayload) {
                Element termGroupListElement = null;
                Element commonPartElement = findCommonPartElement(itemPayload);
-                               
+
                if (commonPartElement != null) {
                        termGroupListElement = findTermGroupListElement(commonPartElement);
                }
-               
+
                return termGroupListElement;
        }
-       
+
        private Element findCommonPartElement(PoxPayloadOut itemPayload) {
                Element commonPartElement = null;
-               
+
                for (PayloadOutputPart candidatePart : itemPayload.getParts()) {
                        Element candidatePartElement = candidatePart.asElement();
-                       
+
                        if (candidatePartElement.getName().endsWith("_common")) {
                                commonPartElement = candidatePartElement;
                                break;
@@ -482,86 +483,86 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
 
                return commonPartElement;
        }
-       
+
        private Element findTermGroupListElement(Element contextElement) {
                Element termGroupListElement = null;
                Iterator<Element> childIterator = contextElement.elementIterator();
-               
+
                while (childIterator.hasNext()) {
                        Element candidateElement = childIterator.next();
-                       
+
                        if (candidateElement.getName().endsWith("TermGroupList")) {
                                termGroupListElement = candidateElement;
                                break;
                        }
                }
-               
+
                return termGroupListElement;
        }
-       
+
        private void mergeTermGroupLists(Element targetTermGroupListElement, Element sourceTermGroupListElement) {
                Map<String, Element> sourceTermGroups;
-               
+
                try {
                        sourceTermGroups = getTermGroups(sourceTermGroupListElement);
                }
                catch(RuntimeException e) {
                        throw new RuntimeException("a problem was found in the source record: " + e.getMessage(), e);
                }
-               
+
                for (Element targetTermGroupElement : (List<Element>) targetTermGroupListElement.elements()) {
                        String displayName = getDisplayName(targetTermGroupElement);
-                       
+
                        if (sourceTermGroups.containsKey(displayName)) {
                                logger.debug("Merging in existing term \"" + displayName + "\"");
-                               
+
                                try {
                                        mergeTermGroups(targetTermGroupElement, sourceTermGroups.get(displayName));
                                }
                                catch(RuntimeException e) {
                                        throw new RuntimeException("could not merge term groups with display name \"" + displayName + "\": " + e.getMessage(), e);
                                }
-                                       
+
                                sourceTermGroups.remove(displayName);
                        }
                }
-               
+
                for (Element sourceTermGroupElement : sourceTermGroups.values()) {
                        logger.debug("Adding new term \"" + getDisplayName(sourceTermGroupElement) + "\"");
-                       
+
                        targetTermGroupListElement.add(sourceTermGroupElement.createCopy());
                }
        }
-       
+
        private void mergeTermGroups(Element targetTermGroupElement, Element sourceTermGroupElement) {
                // This function assumes there are no nested repeating groups.
-       
+
                for (Element sourceChildElement : (List<Element>) sourceTermGroupElement.elements()) {
                        String sourceValue = sourceChildElement.getText();
-                       
+
                        if (sourceValue == null) {
                                sourceValue = "";
                        }
-                       
+
                        if (sourceValue.length() > 0) {
                                String name = sourceChildElement.getName();
                                Element targetChildElement = targetTermGroupElement.element(name);
-                               
+
                                if (targetChildElement == null) {
                                        targetTermGroupElement.add(sourceChildElement.createCopy());
                                }
                                else {
                                        String targetValue = targetChildElement.getText();
-                                       
+
                                        if (targetValue == null) {
                                                targetValue = "";
                                        }
-                                       
+
                                        if (!targetValue.equals(sourceValue)) {
                                                if (targetValue.length() > 0) {
                                                        throw new RuntimeException("merge conflict in field " + name + ": source value \"" + sourceValue + "\" differs from target value \"" + targetValue +"\"");
                                                }
-                                               
+
                                                targetTermGroupElement.remove(targetChildElement);
                                                targetTermGroupElement.add(sourceChildElement.createCopy());
                                        }
@@ -569,54 +570,54 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        }
                }
        }
-       
+
        private String getUpdatePayload(Element originalTermGroupListElement, Element updatedTermGroupListElement) {
                List<Element> parents = new ArrayList<Element>();
-               
+
                for (Element e = originalTermGroupListElement; e != null; e = e.getParent()) {
                        parents.add(e);
                }
-               
+
                Collections.reverse(parents);
-               
+
                // Remove the original termGroupList element
                parents.remove(parents.size() - 1);
-               
+
                // Remove the root
                Element rootElement = parents.remove(0);
-               
+
                // Copy the root to a new document
                Document document = DocumentHelper.createDocument(copyElement(rootElement));
                Element current = document.getRootElement();
-               
+
                // Copy the remaining parents
                for (Element parent : parents) {
                        Element parentCopy = copyElement(parent);
-                       
+
                        current.add(parentCopy);
                        current = parentCopy;
                }
-               
+
                // Add the updated termGroupList element
-               
+
                current.add(updatedTermGroupListElement);
-               
+
                String payload = document.asXML();
 
                return payload;
        }
-       
+
        private Element copyElement(Element element) {
                Element copy = DocumentHelper.createElement(element.getQName());
                copy.appendAttributes(element);
-               
+
                return copy;
        }
-       
+
        private class ReferencingRecord {
                private String uri;
-               private Map<String, Set<String>> fields; 
-               
+               private Map<String, Set<String>> fields;
+
                public ReferencingRecord(String uri) {
                        this.uri = uri;
                        this.fields = new HashMap<String, Set<String>>();
@@ -634,4 +635,4 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob {
                        return fields;
                }
        }
-}
\ No newline at end of file
+}
index 0f8accf75e2873569c5a58ffa8957a81be211b7f..a37b87842d201568818f5ce86aee5a9c21784214 100644 (file)
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.blob.client</artifactId>
     <name>services.blob.client</name>
-    
+
     <dependencies>
         <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql-management</artifactId>
                        <version>${nuxeo.general.release}</version>
         </dependency>
-               
+
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- 
+<!--
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
         </dependency>
- -->        
+ -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
@@ -60,7 +60,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -89,7 +82,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-blob-client</finalName>
     </build>
index b9f4ca85f066fa9e2559cb2135babaf4af3644a0..a8fcb31193466b314b033a96b6e929a70b1855b8 100644 (file)
                        <artifactId>testng</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <groupId>org.apache.tomcat</groupId>
+                       <artifactId>tomcat-servlet-api</artifactId>
+                       <version>${tomcat.version}</version>
+                       <scope>provided</scope>
                </dependency>
 
                <!-- javax -->
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jaxrs</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>tjws</groupId>
-                                       <artifactId>webserver</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                <finalName>collectionspace-services-blob</finalName>
        </build>
 </project>
-
index 3bc13c95975b0a5cef97c2638af45befd6078c75..30fa4878b335bdbd19fe3acc80c2e75187ace20a 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.citation.client</artifactId>
     <name>services.citation.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.citation.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-citation-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index a47a992fe8ff452775c0eddcc224d8afa9e7cdc2..9bd9bc6b674a6896e1b5610f499102f5fc432686 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.citation</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.citation.service</artifactId>
     <name>services.citation.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-        <!-- CollectionSpace dependencies -->        
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -40,7 +40,7 @@
             <artifactId>org.collectionspace.services.citation.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -50,7 +50,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -93,7 +87,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-citation</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 4310795deeb76d0b000af4ce755921e44c78b909..efc123b02f91d09f81af3a429225c8d8e8b7cfad 100644 (file)
@@ -12,7 +12,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.claim.client</artifactId>
     <name>services.claim.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -31,7 +31,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -59,7 +59,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -90,7 +83,7 @@
             <version>3.1</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-claim-client</finalName>
     </build>
index af9fcfdf56436e5c70149639af3f17b5007acca2..0ce3b0679eb7e9aaa6a9ccba229611cd803f4de1 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.claim</artifactId>        
+        <artifactId>org.collectionspace.services.claim</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.claim.service</artifactId>
     <name>services.claim.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <artifactId>dom4j</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -78,7 +72,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -92,9 +86,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-claim</finalName>
     </build>
 </project>
-
index 2ba53db9f59a1f385c60ec51da6444d078601414..afcfbcd798232d8727d2f163605eb4849e8981bc 100644 (file)
@@ -22,7 +22,7 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
 <!-- CollectionSpace dependencies -->
 
         <dependency>
@@ -35,7 +35,7 @@
                    <artifactId>org.collectionspace.services.common-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
 <!-- External dependencies -->
 
         <dependency>
         <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.3.3</version>
+                       <version>4.5.3</version>
         </dependency>
         <dependency>
                        <groupId>xerces</groupId>
                        <artifactId>xercesImpl</artifactId>
                        <version>2.11.0</version>
-               </dependency>        
+               </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,7 +78,7 @@
                        <groupId>org.jboss.logging</groupId>
                        <artifactId>jboss-logging</artifactId>
                        <version>3.1.4.GA</version>
-                       <scope>runtime</scope>          
+                       <scope>runtime</scope>
         </dependency>
         <!-- Set TestNG scope to default (compile), rather than test -->
         <!-- to allow import(s) in AbstractServiceTest class -->
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
-        </dependency>  
+        </dependency>
     </dependencies>
 
     <build>
         </plugins>
     </build>
 </project>
-
index 1f5e1444ca37b24818861f12c08eb29bfcb1f210..c6d0893ecd348f515946f061a4f2dbcb80630dd4 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
     <name>services.collectionobject.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,7 +77,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>cspace-services-collectionobject-client</finalName>
         <plugins>
                 </configuration>
             </plugin>
         </plugins>
-        
+
     </build>
 </project>
index d1f028a0b2e040ec897b43494a4238d4e6c8212b..fe534ca50e334badb2f309b393da3383026a5f7e 100644 (file)
@@ -5,7 +5,7 @@
         <artifactId>org.collectionspace.services.collectionobject</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.collectionobject.service</artifactId>
     <name>services.collectionobject.service</name>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.intake.service</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.relation.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -65,7 +65,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-collectionobject</finalName>
     </build>
 </project>
-
index fbec1faa2a8ba261b4b9663e01e56666ac23b3e9..aa8ef970b91e86fce3918919d58c8f9fe825939d 100644 (file)
@@ -24,7 +24,7 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
index 389a5d981a235fae75e68f1bf794673aba64a369..e73f9793331224463efff62644036db6cdfb28e2 100644 (file)
         </exec>
     </target>
 
+    <target name="deploy_nuxeo"
+            description="deploy nuxeo binaries in ${jee.server.cspace}">
+        <copy todir="${jee.server.cspace}/lib">
+            <fileset dir="${basedir}/lib/nuxeo"/>
+        </copy>
+    </target>
+
     <target name="deploy_spring"
             description="deploy spring binaries in ${jee.server.cspace}">
         <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/spring"/>
         </copy>
     </target>
-       
+
        <target name="deploy_aspectj"
             description="deploy AspectJ binaries in ${jee.server.cspace}">
         <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/slf4j"/>
         </copy>
     </target>
-       
+
     <target name="deploy_xmlmerge"
             description="deploy XMLMerge binaries in ${jee.server.cspace}">
         <copy todir="${jee.server.cspace}/lib">
             <fileset dir="${basedir}/lib/xmlmerge"/>
         </copy>
     </target>
-       
+
     <target name="deploy_tenantconfig"
             description="deploy tenant configuration">
         <copy todir="${jee.server.cspace}/cspace/config/services">
                -->
         <copy todir="${jee.server.cspace}/cspace/config/services/resources">
             <fileset dir="${basedir}/src/main/cspace/config/services/resources"/>
-        </copy>                
+        </copy>
     </target>
 
     <target name="deploy" depends="install"
                -->
         <copy file="${basedir}/target/${common.jar}" todir="${jee.server.cspace}/lib"/>
 
-               <antcall target="deploy_aspectj" />
+        <antcall target="deploy_nuxeo" />
+        <antcall target="deploy_aspectj" />
         <antcall target="deploy_spring" />
         <antcall target="deploy_slf4j" />
         <antcall target="deploy_xmlmerge" />
 
     <target name="undeploy"
             description="undeploy common elements from ${jee.server.cspace}">
+        <antcall target="undeploy_nuxeo" />
         <antcall target="undeploy_aspectj" />
                <antcall target="undeploy_spring" />
                <antcall target="undeploy_slf4j" />
         <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
     </target>
 
+    <target name="undeploy_nuxeo"
+            description="undeploy nuxeo binaries from ${jee.server.cspace}">
+        <delete>
+            <fileset dir="${jee.server.cspace}/lib" includes="nuxeo-*.jar"/>
+        </delete>
+    </target>
+
     <target name="undeploy_spring"
             description="undeploy spring binaries from ${jee.server.cspace}">
         <delete>
             <fileset dir="${jee.server.cspace}/lib" includes="stax2-api-*.jar"/>
         </delete>
     </target>
-       
+
        <target name="undeploy_aspectj"
             description="undeploy AspectJ binaries from ${jee.server.cspace}">
         <delete>
             <fileset dir="${jee.server.cspace}/lib" includes="aspectj*-*.jar"/>
         </delete>
     </target>
-       
+
     <target name="undeploy_slf4j"
             description="undeploy SLF4J binaries from ${jee.server.cspace}">
         <delete>
-            <fileset dir="${jee.server.cspace}/lib" includes="slf4j*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="slf4j-*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="log4j-*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="jcl-over-slf4j-*.jar"/>
         </delete>
     </target>
-       
+
     <target name="undeploy_xmlmerge"
             description="undeploy XMLMerge binaries from ${jee.server.cspace}">
         <delete>
             <fileset dir="${jee.server.cspace}/lib" includes="module-xml_merge*.jar"/>
         </delete>
     </target>
-       
+
     <target name="dist_spring"
             description="dist spring binaries in ${dist.server.cspace}">
         <copy todir="${services.trunk}/${dist.server.cspace}/lib">
         <antcall target="dist_spring" />
         <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
             <fileset dir="${basedir}/src/main/cspace/config/services"/>
-        </copy>                
+        </copy>
     </target>
 
 </project>
diff --git a/services/common/lib/nuxeo/nuxeo-runtime-launcher-9.10.jar b/services/common/lib/nuxeo/nuxeo-runtime-launcher-9.10.jar
new file mode 100644 (file)
index 0000000..a5d1626
Binary files /dev/null and b/services/common/lib/nuxeo/nuxeo-runtime-launcher-9.10.jar differ
diff --git a/services/common/lib/nuxeo/nuxeo-runtime-tomcat-adapter-9.10.jar b/services/common/lib/nuxeo/nuxeo-runtime-tomcat-adapter-9.10.jar
new file mode 100644 (file)
index 0000000..01e8688
Binary files /dev/null and b/services/common/lib/nuxeo/nuxeo-runtime-tomcat-adapter-9.10.jar differ
diff --git a/services/common/lib/slf4j/jboss-logging-spi-2.1.0.GA.jar b/services/common/lib/slf4j/jboss-logging-spi-2.1.0.GA.jar
deleted file mode 100644 (file)
index 18db908..0000000
Binary files a/services/common/lib/slf4j/jboss-logging-spi-2.1.0.GA.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar b/services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar
new file mode 100644 (file)
index 0000000..12ba126
Binary files /dev/null and b/services/common/lib/slf4j/jcl-over-slf4j-1.7.21.jar differ
diff --git a/services/common/lib/slf4j/log4j-1.2.17.jar b/services/common/lib/slf4j/log4j-1.2.17.jar
new file mode 100644 (file)
index 0000000..1d425cf
Binary files /dev/null and b/services/common/lib/slf4j/log4j-1.2.17.jar differ
diff --git a/services/common/lib/slf4j/log4j-api-2.9.1.jar b/services/common/lib/slf4j/log4j-api-2.9.1.jar
new file mode 100644 (file)
index 0000000..04cabc8
Binary files /dev/null and b/services/common/lib/slf4j/log4j-api-2.9.1.jar differ
diff --git a/services/common/lib/slf4j/log4j-core-2.9.1.jar b/services/common/lib/slf4j/log4j-core-2.9.1.jar
new file mode 100644 (file)
index 0000000..c4dcdb5
Binary files /dev/null and b/services/common/lib/slf4j/log4j-core-2.9.1.jar differ
diff --git a/services/common/lib/slf4j/slf4j-api-1.6.1.jar b/services/common/lib/slf4j/slf4j-api-1.6.1.jar
deleted file mode 100644 (file)
index f1f4fdd..0000000
Binary files a/services/common/lib/slf4j/slf4j-api-1.6.1.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/slf4j-api-1.7.21.jar b/services/common/lib/slf4j/slf4j-api-1.7.21.jar
new file mode 100644 (file)
index 0000000..2a5c33e
Binary files /dev/null and b/services/common/lib/slf4j/slf4j-api-1.7.21.jar differ
diff --git a/services/common/lib/slf4j/slf4j-log4j12-1.6.1.jar b/services/common/lib/slf4j/slf4j-log4j12-1.6.1.jar
deleted file mode 100644 (file)
index 6411599..0000000
Binary files a/services/common/lib/slf4j/slf4j-log4j12-1.6.1.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/slf4j-log4j12-1.7.21.jar b/services/common/lib/slf4j/slf4j-log4j12-1.7.21.jar
new file mode 100644 (file)
index 0000000..ff4fddd
Binary files /dev/null and b/services/common/lib/slf4j/slf4j-log4j12-1.7.21.jar differ
index e00db1fe31803584a05db24411ad05816bf62c2d..47c3159649bb022d4573f6dc9c28305e227cb2a7 100644 (file)
@@ -38,7 +38,7 @@
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.relation.client</artifactId>
                        <version>${project.version}</version>
-               </dependency>           
+               </dependency>
                <dependency>
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.systeminfo.client</artifactId>
@@ -59,7 +59,7 @@
                        <artifactId>org.collectionspace.services.publicitem.jaxb</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <!-- <dependency> <groupId>org.collectionspace.services</groupId> <artifactId>org.collectionspace.services.3rdparty.nuxeo.quote-api</artifactId> 
+               <!-- <dependency> <groupId>org.collectionspace.services</groupId> <artifactId>org.collectionspace.services.3rdparty.nuxeo.quote-api</artifactId>
                        <version>${project.version}</version> </dependency> -->
                <dependency>
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.authorization.service</artifactId>
                        <version>${project.version}</version>
                </dependency>
-<!-- 
+<!--
                <dependency>
                        <groupId>org.collectionspace.services</groupId>
                        <artifactId>org.collectionspace.services.authorization-common</artifactId>
                        <version>${project.version}</version>
                </dependency>
- -->           
+ -->
 
                <!-- Utilities -->
                <!-- For NuxeoRESTClient.java class -->
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-dbcp</artifactId>
-                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-catalina</artifactId>
-                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
 
                <!-- javax -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <groupId>org.apache.tomcat</groupId>
+                       <artifactId>tomcat-servlet-api</artifactId>
+                       <version>${tomcat.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jaxrs</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>tjws</groupId>
-                                       <artifactId>webserver</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-core</artifactId>
                        <version>${nuxeo.platform.version}</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-imaging-api</artifactId>
                        <version>${nuxeo.platform.version}</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.nuxeo.ecm.core</groupId>
-                       <artifactId>nuxeo-core-storage-sql-ra</artifactId>
-               </dependency>
-               <!-- 
+               <!--
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-io</artifactId>
                        <artifactId>spring-aop</artifactId>
                        <version>${spring.version}</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
+                       <artifactId>jackson-core</artifactId>
                        <version>2.8.0</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.easymock</groupId>
                        <artifactId>easymock</artifactId>
                </plugins>
        </build>
 </project>
-
index f795ebd2df071c6706712f082c5e01f74b97a655..ac9024188a457b77164f1bfefc9a5f3db65357c6 100644 (file)
@@ -17,7 +17,7 @@ import javax.servlet.ServletContext;
 import javax.sql.DataSource;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
 
 import org.collectionspace.authentication.AuthN;
 
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Main class for Services layer. It reads configuration and performs service
  * level initialization. It is a singleton.
- * @author 
+ * @author
  */
 public class ServiceMain {
 
@@ -72,7 +72,7 @@ public class ServiceMain {
     /**
      * For some reason, we have trouble getting logging from this class directed to
      * the tomcat/catalina console log file.  So we do it explicitly with this method.
-     * 
+     *
      * @param str
      */
     private static void mirrorToStdOut(String str) {
@@ -88,15 +88,15 @@ public class ServiceMain {
 
     private static final String SERVER_HOME_PROPERTY = "catalina.base";
        private static final boolean USE_APP_GENERATED_CONFIG = true;
-       
+
        private static ServletContext servletContext = null;
-    
+
        private NuxeoConnectorEmbedded nuxeoConnector;
     private String serverRootDir = null;
     private ServicesConfigReaderImpl servicesConfigReader;
     private TenantBindingConfigReaderImpl tenantBindingConfigReader;
     private UriTemplateRegistry uriTemplateRegistry = new UriTemplateRegistry();
-        
+
     private static final String DROP_DATABASE_SQL_CMD = "DROP DATABASE";
     private static final String DROP_DATABASE_IF_EXISTS_SQL_CMD = DROP_DATABASE_SQL_CMD + " IF EXISTS %s;";
     private static final String DROP_USER_SQL_CMD = "DROP USER";
@@ -107,9 +107,9 @@ public class ServiceMain {
     private ServiceMain() {
        // Intentionally blank
     }
-        
+
     /*
-     * 
+     *
      * Set this singletons ServletContext without any call to initialize
      */
     private static void setServletContext(ServletContext servletContext) {
@@ -119,20 +119,20 @@ public class ServiceMain {
                }
                }
     }
-        
+
     public String getCspaceDatabaseName() {
        return getServiceConfig().getDbCspaceName();
     }
-        
+
     public boolean inServletContext() {
        return ServiceMain.servletContext != null;
     }
-    
+
     public static ServiceMain getInstance(ServletContext servletContext) {
        setServletContext(servletContext);
        return ServiceMain.getInstance();
     }
-    
+
     /**
      * getInstance returns the ServiceMain singleton instance after proper
      * initialization in a thread-safe manner
@@ -161,44 +161,44 @@ public class ServiceMain {
                 }
             }
         }
-        
+
         if (instance == null) {
                throw new RuntimeException("Could not initialize the CollectionSpace services.  Please see the CollectionSpace services log file(s) for details.");
         }
-        
+
         return instance;
     }
 
     private void initialize() throws Exception {
        // set our root directory
        setServerRootDir();
-       
+
                // read in and set our Services config
        readAndSetServicesConfig();
 
        // Set our AuthN's datasource to for the cspaceDataSource
        AuthN.setDataSource(JDBCTools.getDataSource(JDBCTools.CSPACE_DATASOURCE_NAME));
-               
+
        // In each tenant, set properties that don't already have values
        // to their default values.
         propagateConfiguredProperties();
-                
+
         // Create or update Nuxeo's per-repository configuration files.
         createOrUpdateNuxeoDatasourceConfigFiles();
         createOrUpdateNuxeoRepositoryConfigFiles();
         createOrUpdateNuxeoElasticsearchConfigFiles();
-        
+
         // Create the Nuxeo-managed databases, along with the requisite
         // access rights to each.
        HashSet<String> dbsCheckedOrCreated = createNuxeoDatabases();
-        
+
         // Update the SQL script that drops databases and users,
         // to include DROP statements for each of the Nuxeo-managed
         // database names and for each relevant datasource user.
         String[] dataSourceNames = {JDBCTools.NUXEO_DATASOURCE_NAME, JDBCTools.NUXEO_READER_DATASOURCE_NAME};
         updateInitializationScript(getNuxeoDatabasesInitScriptFilename(),
                 dbsCheckedOrCreated, dataSourceNames);
-        
+
         //
         // Start up and initialize our embedded Nuxeo instance.
         //
@@ -216,12 +216,12 @@ public class ServiceMain {
                //
                throw new RuntimeException("Unknown CollectionSpace services client type: " + getClientType());
         }
-        
+
         //
         //
         //
-        initializeEventListeners();        
-        
+        initializeEventListeners();
+
         //
         // Mark if a tenant's bindings have changed since the last time we started, by comparing the MD5 hash of each tenant's bindings with that of
         // the bindings the last time we started/launch.
@@ -235,7 +235,7 @@ public class ServiceMain {
                AuthorizationCommon.setTenantConfigMD5Hash(tenantId, currentMD5Hash); // store this for later.  We'll persist this info with the tenant record.
                tenantBinding.setConfigChangedSinceLastStart(hasConfigChanged(tenantBinding, persistedMD5Hash, currentMD5Hash));
         }
-        
+
         //
         // Create all the tenant records, default user accounts, roles, and permissions.  Since some of our "cspace" database config files
         // for Spring need to be created at build time, the "cspace" database already will be suffixed with the
@@ -245,7 +245,7 @@ public class ServiceMain {
                try {
                        jpaTransactionContext.beginTransaction();
                        DatabaseProductType databaseProductType = JDBCTools.getDatabaseProductType(JDBCTools.CSPACE_DATASOURCE_NAME,
-                                       cspaceDatabaseName);            
+                                       cspaceDatabaseName);
                        AuthorizationCommon.createTenants(tenantBindingConfigReader, databaseProductType, cspaceDatabaseName);
                        AuthorizationCommon.createDefaultWorkflowPermissions(jpaTransactionContext, tenantBindingConfigReader, databaseProductType, cspaceDatabaseName);
                        AuthorizationCommon.createDefaultAccounts(tenantBindingConfigReader, databaseProductType, cspaceDatabaseName);
@@ -263,17 +263,17 @@ public class ServiceMain {
                //
                showTenantStatus();
     }
-        
+
        /**
      * Returns the primary repository name for a tenant -there's usually just one.
      * @param tenantBinding
      * @return
      * @throws InstantiationException
      */
-    
+
        protected String getPrimaryRepositoryName(TenantBindingType tenantBinding) throws InstantiationException {
        String result = "default";
-       
+
        List<RepositoryDomainType> repositoryDomainList = tenantBinding.getRepositoryDomain();
        if (repositoryDomainList != null && repositoryDomainList.isEmpty() == false) {
                String repositoryName = repositoryDomainList.get(PRIMARY_REPOSITORY_DOMAIN).getRepositoryName();
@@ -286,17 +286,17 @@ public class ServiceMain {
                logger.error(msg);
                throw new InstantiationException(msg);
        }
-       
+
        return result;
     }
-    
+
     /**
      * Initialize the event listeners.  We're essentially registering listeners with tenants.  This ensures that listeners ignore events
      * caused by other tenants.
      */
     private void initializeEventListeners() {
        Hashtable<String, TenantBindingType> tenantBindings = this.tenantBindingConfigReader.getTenantBindings();
-       
+
         for (TenantBindingType tenantBinding : tenantBindings.values()) {
                EventListenerConfigurations eventListenerConfigurations = tenantBinding.getEventListenerConfigurations();
                if (eventListenerConfigurations != null) {
@@ -346,7 +346,7 @@ public class ServiceMain {
                if (eventListenerConfig.isRequired() == true) {
                        throw new RuntimeException(String.format("Required event listener '%s' missing or could not be instantiated.", eventListenerConfig.getId()));
                }
-               
+
        }
 
        private void showTenantStatus() {
@@ -367,7 +367,7 @@ public class ServiceMain {
                        "Version");
        mirrorToStdOut(header);
        mirrorToStdOut(headerUnderscore);
-                       
+
        for (String tenantId : tenantBindingsList.keySet()) {
                TenantBindingType tenantBinding = tenantBindingsList.get(tenantId);
                String statusLine = String.format(headerTemplate,
@@ -381,7 +381,7 @@ public class ServiceMain {
        // footer
        mirrorToStdOut("++++++++++++++++ ........................................ ++++++++++++++++++++++++");
     }
-    
+
     /**
      * release releases all resources occupied by service layer infrastructure
      * but not necessarily those occupied by individual services
@@ -402,30 +402,30 @@ public class ServiceMain {
         //read service config
         servicesConfigReader = new ServicesConfigReaderImpl(getServerRootDir());
         servicesConfigReader.read(USE_APP_GENERATED_CONFIG);
-        
+
         Boolean useAppGeneratedBindings = servicesConfigReader.getConfiguration().isUseAppGeneratedTenantBindings();
-        tenantBindingConfigReader = new TenantBindingConfigReaderImpl(getServerRootDir()); 
+        tenantBindingConfigReader = new TenantBindingConfigReaderImpl(getServerRootDir());
         tenantBindingConfigReader.read(useAppGeneratedBindings);
     }
-    
+
     /*
      * Returns 'true' if the tenant bindings have change since we last started up the Services layer of if the 'forceUpdate' field in the bindings
      * has been set to 'true'
-     * 
+     *
      */
        private static boolean hasConfigChanged(TenantBindingType tenantBinding, String persistedMD5Hash,
                        String currentMD5Hash) {
                boolean result = false;
-               
+
                if (persistedMD5Hash == null || tenantBinding.isForceUpdate() == true) {
                        result = true;
                } else {
                        result = !persistedMD5Hash.equals(currentMD5Hash);  // if the two hashes don't match, the tenant bindings have changed so we'll return 'true'
                }
-               
+
                return result;
        }
-    
+
 
     private void propagateConfiguredProperties() {
         List<PropertyType> repoPropListHolder =
@@ -437,14 +437,14 @@ public class ServiceMain {
             }
         }
     }
-    
+
        /**
         * Create required indexes (aka indices) in database tables not associated
         * with any specific tenant.
-        * 
+        *
         * We need to loop over each repository/db declared in the tenant bindings.
         * The assumption here is that each repo/db is a Nuxeo repo/DB.
-        * 
+        *
         * @throws Exception
         */
        void createRequiredIndices() throws Exception {
@@ -466,13 +466,13 @@ public class ServiceMain {
                                        final String COLLECTIONSPACE_CORE_TABLE_NAME = "collectionspace_core";
                                        final String NUXEO_FULLTEXT_TABLE_NAME = "fulltext";
                                        final String NUXEO_HIERARCHY_TABLE_NAME = "hierarchy";
-                       
+
                                        Map<Integer, List<String>> fieldsToIndex = new HashMap<Integer, List<String>>();
                                        fieldsToIndex.put(1, new ArrayList<String>(Arrays.asList(COLLECTIONSPACE_CORE_TABLE_NAME, "tenantid")));
                                        fieldsToIndex.put(2, new ArrayList<String>(Arrays.asList(COLLECTIONSPACE_CORE_TABLE_NAME, "updatedat")));
                                        fieldsToIndex.put(3, new ArrayList<String>(Arrays.asList(NUXEO_FULLTEXT_TABLE_NAME, "jobid")));
                                        fieldsToIndex.put(4, new ArrayList<String>(Arrays.asList(NUXEO_HIERARCHY_TABLE_NAME, "name")));
-                       
+
                                        // Invoke existing post-init code to create these indexes,
                                        // sending in the set of values above, in contrast to
                                        // drawing these values from per-tenant configuration.
@@ -583,7 +583,7 @@ public class ServiceMain {
     public NuxeoConnectorEmbedded getNuxeoConnector() {
         return nuxeoConnector;
     }
-    
+
     /**
      * @return the serverRootDir
      */
@@ -594,26 +594,26 @@ public class ServiceMain {
     private String getCspaceServicesConfigDir() {
         return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_CONFIG_SERVICES_DIR_PATH;
     }
-    
+
     private String getNuxeoConfigDir() {
         return getServerRootDir() + File.separator + JEEServerDeployment.NUXEO_SERVER_CONFIG_DIR;
     }
-    
+
     private String getNuxeoProtoConfigFilename() {
         return JEEServerDeployment.NUXEO_PROTOTYPE_REPO_CONFIG_FILENAME;
     }
-    
+
     private String getNuxeoProtoDatasourceFilename() {
         return JEEServerDeployment.NUXEO_PROTOTYPE_DATASOURCE_FILENAME;
     }
-    
+
     private String getNuxeoProtoElasticsearchConfigFilename() {
         return JEEServerDeployment.NUXEO_PROTO_ELASTICSEARCH_CONFIG_FILENAME;
-    }    
+    }
 
     private String getNuxeoProtoElasticsearchExtensionFilename() {
         return JEEServerDeployment.NUXEO_PROTO_ELASTICSEARCH_EXTENSION_FILENAME;
-    }    
+    }
 
     private String getDatabaseScriptsPath() {
         DatabaseProductType dbType;
@@ -635,10 +635,10 @@ public class ServiceMain {
         return databaseScriptsPath;
 
     }
-    
+
     /**
      * Returns the full filesystem path to the Nuxeo databases initialization script file.
-     * 
+     *
      * @return the full path to the Nuxeo databases initialization script file.
      * Returns an empty String for the path if the database scripts path is null or empty.
      */
@@ -646,26 +646,26 @@ public class ServiceMain {
         return Tools.notBlank(getDatabaseScriptsPath()) ?
                 getDatabaseScriptsPath() + File.separator + JEEServerDeployment.NUXEO_DB_INIT_SCRIPT_FILENAME : "";
     }
-    
+
     /**
      * @return the server resources path
      */
     public String getServerResourcesPath() {
         return getServerRootDir() + File.separator + ConfigReader.RESOURCES_DIR_PATH + File.separator;
     }
-    
+
     public InputStream getResourceAsStream(String resourceName) throws FileNotFoundException {
        InputStream result = new FileInputStream(new File(getServerResourcesPath() + resourceName));
        return result;
-    }    
-    
+    }
+
     public String getCspaceInstanceId() {
        String result = getServiceConfig().getCspaceInstanceId();
-       
+
        if (result == null || result.trim().isEmpty()) {
                result = ""; //empty string
        }
-       
+
        return result;
     }
     /*
@@ -674,7 +674,7 @@ public class ServiceMain {
         * Get the NuxeoDS info and create the necessary databases.
         * Consider the tenant bindings to find and get the data sources for each tenant.
         * There may be only one, one per tenant, or something in between.
-     * 
+     *
      */
     private HashSet<String> createNuxeoDatabases() throws Exception {
         String nuxeoUser = getBasicDataSourceUsername(JDBCTools.NUXEO_DATASOURCE_NAME);
@@ -682,7 +682,7 @@ public class ServiceMain {
 
         String readerUser = getBasicDataSourceUsername(JDBCTools.NUXEO_READER_DATASOURCE_NAME);
        String readerPW = getBasicDataSourcePassword(JDBCTools.NUXEO_READER_DATASOURCE_NAME);
-       
+
        DatabaseProductType dbType = JDBCTools.getDatabaseProductType(JDBCTools.CSADMIN_DATASOURCE_NAME,
                        getServiceConfig().getDbCsadminName());
 
@@ -694,7 +694,7 @@ public class ServiceMain {
         for (TenantBindingType tenantBinding : tenantBindings.values()) {
             String tId = tenantBinding.getId();
             String tName = tenantBinding.getName();
-            
+
             List<RepositoryDomainType> repoDomainList = tenantBinding.getRepositoryDomain();
             for (RepositoryDomainType repoDomain : repoDomainList) {
                 String repoDomainName = repoDomain.getName();
@@ -729,16 +729,16 @@ public class ServiceMain {
                 }
             } // Loop on repos for tenant
         } // Loop on tenants
-                
+
         return nuxeoDBsChecked;
-       
+
     }
-    
+
         /**
          * Creates a Nuxeo-managed database, sets up an owner for that
          * database, and adds (at least) connection privileges to a reader
          * of that database.
-         * 
+         *
          * @param conn
          * @param dbType
          * @param dbName
@@ -746,7 +746,7 @@ public class ServiceMain {
          * @param ownerPW
          * @param readerName
          * @param readerPW
-         * @throws Exception 
+         * @throws Exception
          */
        private void createDatabaseWithRights(DatabaseProductType dbType, String dbName, String ownerName,
                        String ownerPW, String readerName, String readerPW) throws Exception {
@@ -809,7 +809,7 @@ public class ServiceMain {
                }
 
        }
-        
+
         private BasicDataSource getBasicDataSource(String dataSourceName) {
             BasicDataSource basicDataSource = null;
             if (Tools.isBlank(dataSourceName)) {
@@ -825,7 +825,7 @@ public class ServiceMain {
             }
             return basicDataSource;
         }
-        
+
         private String getBasicDataSourceUsername(String dataSourceName) {
             String username = null;
             BasicDataSource basicDataSource = getBasicDataSource(dataSourceName);
@@ -835,7 +835,7 @@ public class ServiceMain {
             username = basicDataSource.getUsername();
             return username;
         }
-        
+
         private String getBasicDataSourcePassword(String dataSourceName) {
             String password = null;
             BasicDataSource basicDataSource = getBasicDataSource(dataSourceName);
@@ -845,21 +845,21 @@ public class ServiceMain {
             password = basicDataSource.getPassword();
             return password;
         }
-     
+
     /*
      * This might be useful for something, but the reader grants are better handled in the ReportPostInitHandler.
-     * 
-     * 
+     *
+     *
      */
-/*     
+/*
     private void handlePostNuxeoInitDBTasks() throws Exception {
        Statement stmt = null;
                Connection conn = null;
-               
+
        try {
                DataSource nuxeoMgrDataSource = JDBCTools.getDataSource(JDBCTools.NUXEO_MANAGER_DATASOURCE_NAME);
                DataSource nuxeoReaderDataSource = JDBCTools.getDataSource(JDBCTools.NUXEO_READER_DATASOURCE_NAME);
-               
+
                if(nuxeoReaderDataSource!=null) {
                        // We need to fetch the user name and password from the nuxeoDataSource, to do grants below
                        org.apache.tomcat.dbcp.dbcp.BasicDataSource tomcatDataSource =
@@ -869,7 +869,7 @@ public class ServiceMain {
                        DatabaseProductType dbType = JDBCTools.getDatabaseProductType(
                                        JDBCTools.CSPACE_DATASOURCE_NAME,
                                        JDBCTools.DEFAULT_CSPACE_DATABASE_NAME); // only returns PG or MYSQL
-       
+
                        conn = nuxeoMgrDataSource.getConnection();
                        stmt = conn.createStatement();
                        if(dbType==DatabaseProductType.POSTGRESQL) {
@@ -899,7 +899,7 @@ public class ServiceMain {
 
     }
 */
-    
+
     private void setServerRootDir() {
         serverRootDir = System.getProperty(SERVER_HOME_PROPERTY);
         if (serverRootDir == null) {
@@ -938,19 +938,19 @@ public class ServiceMain {
     public TenantBindingConfigReaderImpl getTenantBindingConfigReader() {
         return tenantBindingConfigReader;
     }
-    
+
     public ResourceMap getJaxRSResourceMap() {
         ResourceMap result;
-        
+
         result = ResteasyProviderFactory.getContextData(ResourceMap.class);
-        
+
         return result;
     }
-    
+
     /**
      *  Populate a registry of URI templates by querying each resource
      *  for its own entries in the registry.
-     * 
+     *
      *  These entries consist of one or more URI templates associated
      *  with that resource, for building URIs to access that resource.
      */
@@ -978,9 +978,9 @@ public class ServiceMain {
         }
         return uriTemplateRegistry;
     }
-    
+
        /**
-     * 
+     *
      */
        private void createOrUpdateNuxeoDatasourceConfigFiles() throws Exception {
                // Get the prototype copy of the Nuxeo datasource config file.
@@ -1042,7 +1042,7 @@ public class ServiceMain {
                        }
                }
        }
-       
+
        private File getProtoElasticsearchConfigFile() throws Exception {
                File result = new File(getCspaceServicesConfigDir() + File.separator
                                + getNuxeoProtoElasticsearchConfigFilename());
@@ -1064,7 +1064,7 @@ public class ServiceMain {
 
                return result;
        }
-       
+
        private File getProtoElasticsearchExtensionFile() throws Exception {
                File result = new File(getCspaceServicesConfigDir() + File.separator
                                + getNuxeoProtoElasticsearchExtensionFilename());
@@ -1085,8 +1085,8 @@ public class ServiceMain {
                }
 
                return result;
-       }       
-       
+       }
+
        private void createOrUpdateNuxeoElasticsearchConfigFiles() throws Exception {
                //
                // Get the prototype copy of the Nuxeo Elasticsearch extension element and
@@ -1109,19 +1109,19 @@ public class ServiceMain {
                                        } else {
                                                logger.debug(String.format("Repository name is %s", repositoryName));
                                                Document protoElasticsearchExtensionDoc = XmlTools.fileToXMLDocument(protoElasticsearchExtensionFile);
-                                               
+
                                                protoElasticsearchExtensionDoc = updateElasticSearchExtensionDoc(protoElasticsearchExtensionDoc, repositoryName, this.getCspaceInstanceId(), tbt.getElasticSearchIndexConfig());
                                                if (logger.isDebugEnabled()) {
                                                        String extension = protoElasticsearchExtensionDoc.asXML();
                                                        logger.trace(String.format("Updated Elasticsearch extension for '%s' repository: contents=\n", repositoryName, extension));
                                                }
-                                               //extensionList.append(protoElasticsearchExtensionDoc.asXML() + '\n');  
-                                               extensionList.append(XmlTools.asXML(protoElasticsearchExtensionDoc, true) + '\n');      
+                                               //extensionList.append(protoElasticsearchExtensionDoc.asXML() + '\n');
+                                               extensionList.append(XmlTools.asXML(protoElasticsearchExtensionDoc, true) + '\n');
                                        }
                                }
                        }
                }
-               
+
                //
                // Create the final Nuxeo Elasticsearch configuration file and deploy it to the Nuxeo server.
                //
@@ -1138,15 +1138,15 @@ public class ServiceMain {
                        FileUtilities.StringToFile(str, elasticSearchConfigFile);
                } else {
                        logger.error("Could not create Elasticsearch configuration files.  Check that the prototype configuration files are properly formatted and in the correct location.");
-               }       
+               }
        }
-    
+
    /**
     * Ensure that Nuxeo repository configuration files exist for each repository
     * specified in tenant bindings. Create or update these files, as needed.
     */
     private void createOrUpdateNuxeoRepositoryConfigFiles() throws Exception {
-        
+
         // Get the prototype copy of the Nuxeo repository config file.
         File prototypeNuxeoConfigFile =
                 new File(getCspaceServicesConfigDir() + File.separator + getNuxeoProtoConfigFilename());
@@ -1160,10 +1160,10 @@ public class ServiceMain {
             throw new RuntimeException(msg);
         }
         if (logger.isInfoEnabled()) {
-            logger.info(String.format("Using prototype Nuxeo config file at path %s", 
+            logger.info(String.format("Using prototype Nuxeo config file at path %s",
                        prototypeNuxeoConfigFile.getAbsolutePath()));
         }
-        
+
         //
         // Create the xml config file and fill in the correct values.
         //
@@ -1214,7 +1214,7 @@ public class ServiceMain {
             }
         }
     }
-    
+
     /*
      * This method is filling out the proto-repo-config.xml file with tenant specific repository information.
      */
@@ -1224,20 +1224,20 @@ public class ServiceMain {
 
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, "/component", "name",
                 String.format("config:%s-repository", repositoryName));
-        
+
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.CONFIGURATION_EXTENSION_POINT_XPATH + "/blobprovider", "name",
                 repositoryName);
-        
+
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
                        ConfigUtils.CONFIGURATION_EXTENSION_POINT_XPATH + "/blobprovider/property[@name='path']",
                                Tools.isBlank(binaryStorePath) ? repositoryName : binaryStorePath);
-        
+
         // Text substitutions within first extension point, "repository"
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository", "name",
                 repositoryName);
-        
+
 //        repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
 //                     ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository/binaryStore", "path",
 //                Tools.isBlank(binaryStorePath) ? repositoryName : binaryStorePath);  // Can be either partial or full path.  Partial path will be relative to Nuxeo's data directory
@@ -1246,14 +1246,14 @@ public class ServiceMain {
         String jdbcOptions = XmlTools.getElementValue(repoConfigDoc,
                        ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository/property[@name='JDBCOptions']");
         jdbcOptions = Tools.isBlank(jdbcOptions) ? "" : "?" + jdbcOptions;
-        
+
         repoConfigDoc = XmlTools.setElementValue(repoConfigDoc,
                        ConfigUtils.REPOSITORY_EXTENSION_POINT_XPATH + "/repository/property[@name='DatabaseName']",
                 databaseName + jdbcOptions);
-                
+
         return repoConfigDoc;
     }
-    
+
     /*
      * This method is filling out the proto-datasource-config.xml file with tenant specific repository information.
      */
@@ -1263,12 +1263,12 @@ public class ServiceMain {
 
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc, "/component", "name",
                 String.format("config:%s-datasource", repositoryName));
-        
+
         // Set the <datasource> element's  name attribute
         String datasoureName = "jdbc/" + repositoryName;
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/datasource", "name", datasoureName);
-        
+
         // Get the DB server name
         String serverName = XmlTools.getElementValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/property[@name='ServerName']");
@@ -1282,62 +1282,62 @@ public class ServiceMain {
         // Build the JDBC URL from the parts
         String jdbcUrl = String.format("jdbc:postgresql://%s:%s/%s%s", //FIXME: 'postgresql' string should not be hard coded here
                        serverName, portNumber, databaseName, jdbcOptions);
-        
+
         // Set the <datasource> element's url attribute
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/datasource", "url", jdbcUrl);
         logger.debug(String.format("Built up the following JDBC url: %s", jdbcUrl));
-        
+
         // Get the DB username
         String username = XmlTools.getElementValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/property[@name='User']");
         // Set the <datasource> element's user attribute
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/datasource", "username", username);
-        
+
         // Get the DB password
         String password = XmlTools.getElementValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/property[@name='Password']");
         // Set the <datasource> element's password attribute
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/datasource", "password", password);
-        
+
         // Set the <link> element's name attribute
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/link", "name", "jdbc/repository_" + repositoryName);
         // Set the <link> element's global attribute
         repoConfigDoc = XmlTools.setAttributeValue(repoConfigDoc,
                        ConfigUtils.DATASOURCE_EXTENSION_POINT_XPATH + "/link", "global", datasoureName);
-        
+
         return repoConfigDoc;
     }
-    
+
     private String getElasticsearchIndexName(Document repoConfigDoc, String repositoryName,
                String cspaceInstanceId) {
        String result = ConfigUtils.DEFAULT_ELASTICSEARCH_INDEX_NAME;
-       
+
        if (repositoryName.equalsIgnoreCase(ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME) == false) {
                return repositoryName;
        }
-       
+
        return result;
     }
-    
+
     /*
      * This method is filling out the elasticsearch-config.xml file with tenant specific repository information.
      */
     private Document updateElasticSearchExtensionDoc(Document elasticsearchConfigDoc, String repositoryName,
                String cspaceInstanceId, ElasticSearchIndexConfig elasticSearchIndexConfig) {
-        
+
         // Set the <elasticSearchIndex> element's  name attribute
         String indexName = getElasticsearchIndexName(elasticsearchConfigDoc, repositoryName, cspaceInstanceId);
         elasticsearchConfigDoc = XmlTools.setAttributeValue(elasticsearchConfigDoc,
                        ConfigUtils.ELASTICSEARCH_INDEX_EXTENSION_XPATH + "/elasticSearchIndex", "name", indexName);
-        
+
         // Set the <elasticSearchIndex> element's repository attribute
         elasticsearchConfigDoc = XmlTools.setAttributeValue(elasticsearchConfigDoc,
                        ConfigUtils.ELASTICSEARCH_INDEX_EXTENSION_XPATH + "/elasticSearchIndex", "repository", repositoryName);
-        
+
         if (elasticSearchIndexConfig != null) {
             String settings = elasticSearchIndexConfig.getSettings();
             String mapping = elasticSearchIndexConfig.getMapping();
@@ -1350,23 +1350,23 @@ public class ServiceMain {
                 XmlTools.setElementValue(elasticsearchConfigDoc, ConfigUtils.ELASTICSEARCH_INDEX_EXTENSION_XPATH + "/elasticSearchIndex/mapping", mapping);
             }
         }
-        
+
         return elasticsearchConfigDoc;
     }
 
     /**
      * Update the current copy of the Nuxeo databases initialization script file by
-     * 
+     *
      * <ul>
      *   <li>Removing all existing DROP DATABASE commands</li>
      *   <li>Removing all existing DROP USER commands</li>
      *   <li>Adding a DROP DATABASE command for each current database, at the top of that file.</li>
      *   <li>Adding DROP USER commands for each provided datasource, following the DROP DATABASE commands.</li>
      * </ul>
-     * 
+     *
      * @param dbInitializationScriptFilePath
-     * @param dbsCheckedOrCreated 
-     * @throws Exception 
+     * @param dbsCheckedOrCreated
+     * @throws Exception
      */
     private void updateInitializationScript(String dbInitializationScriptFilePath, HashSet<String> dbsCheckedOrCreated,
                        String[] dataSourceNames) throws Exception {
@@ -1411,7 +1411,7 @@ public class ServiceMain {
                                        }
                                }
                        }
-                       
+
                        // Add back the comment elided above
                        List<String> replacementLines = new ArrayList<String>();
                        replacementLines.add(DROP_OBJECTS_SQL_COMMENT);
@@ -1421,7 +1421,7 @@ public class ServiceMain {
                                        replacementLines.add(String.format(DROP_DATABASE_IF_EXISTS_SQL_CMD, dbName));
                                }
                        }
-                       
+
                        // Add new DROP USER commands for every provided datasource.
                        String username;
                        for (String dataSourceName : dataSourceNames) {
@@ -1430,13 +1430,13 @@ public class ServiceMain {
                                        replacementLines.add(String.format(DROP_USER_IF_EXISTS_SQL_CMD, username));
                                }
                        }
-                       
+
                        // Now append all existing lines from that file, except for
                        // any lines that were elided above.
                        if (lines != null && !lines.isEmpty()) {
                                replacementLines.addAll(lines);
                        }
-                       
+
                        if (!nuxeoDatabasesInitScriptFile.canWrite()) {
                                String msg = String.format(
                                                "Could not find and/or write the Nuxeo databases initialization script file '%s'",
@@ -1456,11 +1456,11 @@ public class ServiceMain {
 
        public static String getJeeContainPath() throws Exception {
                String result = System.getenv(CSPACE_JEESERVER_HOME);
-               
+
                if (result == null) {
                        throw new Exception();
                }
-               
+
                return result;
        }
 }
index 4cf4585b0033413a47f6ffb2913229f43ef010f0..c68b2a4b2ab9b9bfe81db4cbb5bd2794ae8da4e0 100644 (file)
@@ -1,6 +1,10 @@
 package org.collectionspace.services.common.profile;
 
+import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
+
+import org.apache.commons.lang.NotImplementedException;
+
 import java.io.ByteArrayInputStream;
 
 /* Subclass of ServletInputStream needed by the servlet engine.
@@ -9,6 +13,7 @@ the ByteArrayInputStream (obtained as constructor parameter)!*/
 
 public class BufferedServletInputStream extends ServletInputStream {
     ByteArrayInputStream bais;
+
     public BufferedServletInputStream(ByteArrayInputStream bais) {
         this.bais = bais;
     }
@@ -24,5 +29,19 @@ public class BufferedServletInputStream extends ServletInputStream {
     public int read(byte[] buf, int off, int len) {
         return bais.read(buf, off, len);
     }
-}
 
+    @Override
+    public boolean isFinished() {
+        return false;
+    }
+
+    @Override
+    public boolean isReady() {
+        return false;
+    }
+
+    @Override
+    public void setReadListener(ReadListener listener) {
+        throw new NotImplementedException();
+    }
+}
index 9279de39e1ef9538a43db793b57c35aab2ab1d09..1005eddafd9b27fd7f931b46bb623236ebf53e62 100644 (file)
@@ -3,6 +3,8 @@ package org.collectionspace.services.common.profile;
 import java.io.*;
 import javax.servlet.*;
 
+import org.apache.commons.lang.NotImplementedException;
+
 public class BufferedServletOutputStream extends ServletOutputStream {
     // the actual buffer
     private ByteArrayOutputStream bos = new ByteArrayOutputStream( );
@@ -36,4 +38,14 @@ public class BufferedServletOutputStream extends ServletOutputStream {
         // no way to resize an existing ByteArrayOutputStream
         this.bos = new ByteArrayOutputStream(size);
     }
-}
\ No newline at end of file
+
+    @Override
+    public boolean isReady() {
+        return false;
+    }
+
+    @Override
+    public void setWriteListener(WriteListener listener) {
+        throw new NotImplementedException();
+    }
+}
index 13fa3b3b9bfc7a065bbfa4f76510167733261299..8b68ca3d2e2a00cbdea8e73d88390828445b2ff5 100644 (file)
@@ -43,7 +43,7 @@ import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetProvider;
 
-import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
 
 /**
  * User: laramie
@@ -74,62 +74,45 @@ public class JDBCTools {
     final static Logger logger = LoggerFactory.getLogger(JDBCTools.class);
        private static final CharSequence URL_DATABASE_NAME = "${DatabaseName}";
     private static String JDBC_URL_DATABASE_SEPARATOR = "\\/";
-        
+
        //
        // As a side-effect of calling JDBCTools.getDataSource(...), the DataSource instance will be
        // cached in a static hash map of the JDBCTools class.  This will speed up lookups as well as protect our
        // code from JNDI lookup problems -for example, if the JNDI context gets stepped on or corrupted.
-       //    
+       //
     public static DataSource getDataSource(String dataSourceName) throws NamingException {
        DataSource result = null;
-       
+
        //
        // First, see if we already have this DataSource instance cached
        //
        result = cachedDataSources.get(dataSourceName);
-       if (result == null) {           
+       if (result == null) {
                InitialContext ctx = new InitialContext();
                Context envCtx = null;
 
                if (logger.isDebugEnabled() == true) {
                        logger.debug("Looking up DataSource instance in JNDI with name: " + dataSourceName);
                }
-                       
-               try {
-                       envCtx = (Context) ctx.lookup("java:comp/env");
-                       DataSource ds = (DataSource) envCtx.lookup("jdbc/" + dataSourceName);
-                       if (ds == null) {
-                           throw new IllegalArgumentException("DataSource instance not found: " + dataSourceName);
-                       } else {
-                               result = ds;
-                               // now cache this DataSource instance for future references
-                               cachedDataSources.put(dataSourceName, result);
-                       }
-               } finally {
-                   if (ctx != null) {
-                       try {
-                           ctx.close();
-                       } catch (Exception e) {
-                               logger.error("Error getting DataSource for: " + dataSourceName, e);
-                       }
-                   }
-                   if (envCtx != null) {
-                       try {
-                               envCtx.close();
-                       } catch (Exception e) {
-                               logger.error("Error getting DataSource for: " + dataSourceName, e);
-                       }
-                   }
-               }
+
+            envCtx = (Context) ctx.lookup("java:comp/env");
+            DataSource ds = (DataSource) envCtx.lookup("jdbc/" + dataSourceName);
+            if (ds == null) {
+                throw new IllegalArgumentException("DataSource instance not found: " + dataSourceName);
+            } else {
+                result = ds;
+                // now cache this DataSource instance for future references
+                cachedDataSources.put(dataSourceName, result);
+            }
        }
-       
+
        if (result != null) {
 //             DataSource resultClone = result.
        }
-       
+
        return result;
     }
-    
+
     //
     // Use this version of the getConnection() method when you don't want to qualify the database name
     // with a CollectionSpace instance ID.
@@ -138,25 +121,25 @@ public class JDBCTools {
                String databaseName) throws NamingException, SQLException {
        return getConnection(dataSourceName, databaseName, null);
     }
-    
+
     public static Connection getConnection(String dataSourceName,
                String repositoryName,
                String cspaceInstanceId) throws NamingException, SQLException {
        Connection result = null;
-       
+
        if (Tools.isEmpty(dataSourceName) || Tools.isEmpty(repositoryName)) {
                String errMsg = String.format(
-                               "The getConnection() method was called with an empty or null repository name = '%s' and/or data source name = '%s'.", 
+                               "The getConnection() method was called with an empty or null repository name = '%s' and/or data source name = '%s'.",
                                dataSourceName, repositoryName);
             logger.error(errMsg);
             throw new NamingException(errMsg);
         }
-               
+
        /*
         * We synch this block as a workaround to not have separate DataSource instances for
         * each Nuxeo repo/DB.  Ideally, we should replace the need for this synch block by
         * registering a separate DataSource for each repo/db at init/start-up time.
-        * 
+        *
         * We need to sync because we're changing the URL of the datasource inorder to get the correct
         * connection.  The synch prevents different threads from getting the incorrect connection -i.e., one pointing
         * to the wrong URL.
@@ -173,11 +156,11 @@ public class JDBCTools {
                // Turns out the Tomcat BasicDataSource used a connection pool, so changing the url does not
                // get you a corresponding connection. Use the more basic implementation for now, unless
                // and until we do things right by creating additional JNDI data sources.
-               
+
                //dataSource.setUrl(connectionUrl);
                String user = dataSource.getUsername();
                String password = dataSource.getPassword();
-               
+
                try {
                        //conn = dataSource.getConnection();
                        conn = DriverManager.getConnection(connectionUrl, user, password);
@@ -189,7 +172,7 @@ public class JDBCTools {
                        dataSource.setUrl(urlTemplate); // Reset the data source URL value back to the template value
                }
        }
-               
+
         return result;
     }
 
@@ -199,7 +182,7 @@ public class JDBCTools {
         try {
             conn = getConnection(dataSourceName, repositoryName, cspaceInstanceId);
             stmt = conn.createStatement();
-             
+
             RowSetFactory rowSetFactory = RowSetProvider.newFactory();
             CachedRowSet crs = rowSetFactory.createCachedRowSet();
 
@@ -229,7 +212,7 @@ public class JDBCTools {
             }
         }
     }
-    
+
     public static CachedRowSet executePreparedQuery(final PreparedStatementBuilder builder,
             String dataSourceName, String repositoryName, String cspaceInstanceId) throws Exception {
         Connection conn = null;
@@ -268,7 +251,7 @@ public class JDBCTools {
             }
         }
     }
-    
+
     // FIXME: This method's code significantly overlaps that of executePrepareQuery(), above,
     // and the two could be refactored into a single method, if desired.
     public static List<CachedRowSet> executePreparedQueries(final List<PreparedStatementBuilder> builders,
@@ -334,8 +317,8 @@ public class JDBCTools {
     }
 
     public static int executeUpdate(String dataSourceName,
-               String repositoryName, 
-               String cspaceInstanceId, 
+               String repositoryName,
+               String cspaceInstanceId,
                String sql) throws Exception {
         Connection conn = null;
         Statement stmt = null;
@@ -379,20 +362,20 @@ public class JDBCTools {
     /**
      * Returns the database product name, from the metadata for a
      * JDBC connection to the default repository.
-     * 
+     *
      * Assumes that the database product name will be the same for the
      * default repository and for all other repositories to which JDBC
      * connections will be made, through the methods of this class.
-     * 
+     *
      * @return the database product name
      */
     public static String getDatabaseProductName(String dataSourceName,
                String repositoryName,
                String cspaceInstanceId) throws Exception {
-       
+
        @SuppressWarnings("unused")
                Object driver = Class.forName("org.postgresql.Driver"); // For some reason, we need to make sure the org.postgresql.Driver class in on the classpath
-       
+
        if (DBProductName == null) {
                Connection conn = null;
                try {
@@ -415,22 +398,22 @@ public class JDBCTools {
                    }
                }
        }
-       
+
         return DBProductName;
     }
 
     /**
      * Returns an enumerated value uniquely identifying the database product type;
      * e.g. MySQL, PostgreSQL, based on the database product name.
-     * 
+     *
      * @return an enumerated value identifying the database product type
-     * @throws Exception 
+     * @throws Exception
      */
     public static DatabaseProductType getDatabaseProductType(String dataSourceName,
                String repositoryName,
                String cspaceInstanceId) throws Exception {
        DatabaseProductType result = DatabaseProductType.UNRECOGNIZED;
-       
+
         String productName = getDatabaseProductName(dataSourceName, repositoryName, cspaceInstanceId);
         if (productName.matches("(?i).*mysql.*")) {
                result = DatabaseProductType.MYSQL;
@@ -439,17 +422,17 @@ public class JDBCTools {
         } else {
             throw new Exception("Unrecognized database system " + productName);
         }
-       
+
         return result;
     }
-    
+
     //
     // Same as method above except the cspace instance ID is not needed.
     //
     public static DatabaseProductType getDatabaseProductType(String dataSourceName,
                String repositoryName) throws Exception {
        DatabaseProductType result = DatabaseProductType.UNRECOGNIZED;
-       
+
         String productName = getDatabaseProductName(dataSourceName, repositoryName, null);
         if (productName.matches("(?i).*mysql.*")) {
                result = DatabaseProductType.MYSQL;
@@ -458,17 +441,17 @@ public class JDBCTools {
         } else {
             throw new Exception("Unrecognized database system " + productName);
         }
-       
+
         return result;
     }
-    
+
     /*
      * By convention, the repository name and database name are the same.  However, this
      * call encapulates that convention and allows overrides.
      */
     public static String getDatabaseName(String repoName, String cspaceInstanceId) {
        String result = repoName;
-       
+
        //
        // Insert code here if you want to map the repo name to a database name -otherwise
        // we'll assume they are the same thing.
@@ -476,7 +459,7 @@ public class JDBCTools {
        if (repoName.equalsIgnoreCase(DEFAULT_NUXEO_REPOSITORY_NAME)) {
                result = DEFAULT_NUXEO_DATABASE_NAME;
        }
-       
+
        //
        // If we have a non-null 'cspaceInstanceId' instance ID then we need to append it
        // as a suffix to the database name.
@@ -486,27 +469,27 @@ public class JDBCTools {
                        result = result + cspaceInstanceId;
                }
        }
-       
+
        return result;
     }
-        
+
     /**
      * Returns the catalog/database name for an open JDBC connection.
-     * 
+     *
      * @param conn an open JDBC Connection
      * @return the catalog name.
-     * @throws SQLException 
+     * @throws SQLException
      */
     public static String getDatabaseName(String dataSourceName,
                String repositoryName,
                String cspaceInstanceId,
                Connection conn) throws Exception {
         String databaseName = null;
-        
+
         if (conn != null) {
                DatabaseMetaData metadata = conn.getMetaData();
                String urlStr = metadata.getURL();
-               
+
                // Format of the PostgreSQL JDBC URL:
                // http://jdbc.postgresql.org/documentation/80/connect.html
                if (getDatabaseProductType(dataSourceName, repositoryName, cspaceInstanceId) == DatabaseProductType.POSTGRESQL) {
@@ -520,14 +503,14 @@ public class JDBCTools {
                    databaseName = tokens[tokens.length - 1];
                }
         }
-        
+
         return databaseName;
     }
-    
+
     /**
      * Grant a specified privilege to a database user. This privilege will
      * be applied to all 'public' schema tables within the specified repository.
-     * 
+     *
      * @param dataSourceName a JDBC datasource name.
      * @param repositoryName a repository (e.g. RDBMS database) name.
      * @param cspaceInstanceId a CollectionSpace instance identifier.
@@ -552,11 +535,11 @@ public class JDBCTools {
                 if (hasDatabaseUser(dataSourceName, repositoryName, cspaceInstanceId,
                         databaseProductType, databaseUserName)) {
                     conn = getConnection(dataSourceName, repositoryName, cspaceInstanceId);
-                    stmt = conn.createStatement();                
+                    stmt = conn.createStatement();
                     stmt.execute(sql);
                 }
             }
-            
+
         } catch (SQLException sqle) {
             SQLException tempException = sqle;
             // SQLExceptions can be chained. Loop to log all.
@@ -582,10 +565,10 @@ public class JDBCTools {
             }
         }
     }
-    
+
     /**
      * Create a database user, if that user doesn't already exist.
-     * 
+     *
      * @param conn a database connection.
      * @param dbType a database product type.
      * @param username the name of the database user to create.
@@ -629,10 +612,10 @@ public class JDBCTools {
             }
         }
     }
-    
+
     /**
      * Identify whether a database exists.
-     * 
+     *
      * @param dbType a database product type.
      * @param dbName a database product name.
      * @return true if a database with that name exists, false if that database does not exit.
@@ -676,10 +659,10 @@ public class JDBCTools {
            }
         }
     }
-    
+
     /**
      * Identify whether a database user exists.
-     * 
+     *
      * @param dataSourceName a JDBC datasource name.
      * @param repositoryName a repository (e.g. RDBMS database) name.
      * @param cspaceInstanceId a CollectionSpace instance identifier.
@@ -726,8 +709,8 @@ public class JDBCTools {
            }
         }
     }
-    
-    
+
+
     // -----------------------------
     // Utility methods for debugging
     // -----------------------------
@@ -736,9 +719,9 @@ public class JDBCTools {
      * Prints metadata, such as database username and connection URL,
      * for an open JDBC connection.  This is a utility method for use
      * during debugging.
-     * 
+     *
      * @param conn an open JDBC Connection
-     * @throws SQLException 
+     * @throws SQLException
      */
     private static void printConnectionMetaData(Connection conn) throws SQLException {
         if (conn != null) {
@@ -749,13 +732,13 @@ public class JDBCTools {
             System.out.println("database url=" + metadata.getURL());
         }
     }
-    
+
     /**
      * Prints metadata related to a JDBC ResultSet, such as column names.
      * This is a utility method for use during debugging.
-     * 
+     *
      * @param rs a ResultSet.
-     * @throws SQLException 
+     * @throws SQLException
      */
     public static void printResultSetMetaData(ResultSet rs) throws SQLException {
         if (rs == null) {
@@ -771,5 +754,5 @@ public class JDBCTools {
             // Insert other debug statements to retrieve additional per-column metadata here ...
         }
     }
-               
+
 }
index d2a92aa74f4076e0e7f1dbfe339bf169ba794e6e..63b0547c6418b6a1a1a486ce28fb5db821ff070c 100644 (file)
@@ -50,7 +50,6 @@ import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.document.DocumentWrapperImpl;
 import org.collectionspace.services.common.document.JaxbUtils;
-import org.hsqldb.lib.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,13 +59,13 @@ import org.slf4j.LoggerFactory;
  * create/post inserts multiple tuples between the given object and subjects
  * get retrieves all subjects for the given object in relationship
  * delete deletes all subjects for the given object in relationship
- * @author 
+ * @author
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
 
     private final Logger logger = LoggerFactory.getLogger(JpaRelationshipStorageClient.class);
-    
+
     public JpaRelationshipStorageClient() {
        //empty
     }
@@ -87,8 +86,8 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
             DocumentHandler handler) throws BadRequestException,
             DocumentException {
        String result = null;
-       
-       JPATransactionContext jpaTransactionContext = (JPATransactionContext)ctx.openConnection();      
+
+       JPATransactionContext jpaTransactionContext = (JPATransactionContext)ctx.openConnection();
         try {
             jpaTransactionContext.beginTransaction();
             handler.prepare(Action.CREATE);
@@ -99,7 +98,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
                 JaxbUtils.setValue(relationship, "setCreatedAtItem", Date.class, new Date());
                 jpaTransactionContext.persist(relationship);
             }
-            handler.complete(Action.CREATE, wrapDoc); 
+            handler.complete(Action.CREATE, wrapDoc);
             jpaTransactionContext.commitTransaction();
             result = "0"; // meaningless result
         } catch (BadRequestException bre) {
@@ -116,7 +115,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
                }
             ctx.closeConnection();
         }
-        
+
         return result;
     }
 
@@ -140,18 +139,18 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
                    logger.error(msg);
                    throw new DocumentNotFoundException(msg);
                }
-               
+
                String objectId = getObjectId(ctx);
                DocumentFilter docFilter = handler.getDocumentFilter();
                if (docFilter == null) {
                    docFilter = handler.createDocumentFilter();
                }
-        
+
             handler.prepare(Action.GET);
             StringBuilder queryStrBldr = new StringBuilder("SELECT a FROM ");
             queryStrBldr.append(getEntityName(ctx));
             queryStrBldr.append(" a");
-            
+
             String joinFetch = docFilter.getJoinFetchClause();
             if (Tools.notBlank(joinFetch)) {
                 queryStrBldr.append(" " + joinFetch);
@@ -198,7 +197,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
             ctx.closeConnection();
         }
     }
-    
+
     /**
      * Gets the id.
      *
@@ -207,7 +206,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
      */
     private Long getId(T relationship) {
        Long result = null;
-       
+
        if (relationship != null) {
                if (relationship instanceof AccountRoleRel) {
                        AccountRoleRel accountRoleRel = (AccountRoleRel)relationship;
@@ -217,10 +216,10 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
                        result = permissionRoleRel.getHjid();
                }
        }
-       
+
        return result;
     }
-    
+
     /**
      * Gets the relationship.
      *
@@ -232,7 +231,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
     private T getRelationship(JPATransactionContext jpaTransactionContext, T relationship)
                throws DocumentNotFoundException {
        Long id = getId(relationship);
-       
+
         T relationshipFound = (T)jpaTransactionContext.find(relationship.getClass(), id);
         if (relationshipFound == null) {
             String msg = "Could not find relationship with id=" + id;
@@ -241,7 +240,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
             }
             throw new DocumentNotFoundException(msg);
         }
-        
+
         return relationshipFound;
     }
 
@@ -263,7 +262,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
             logger.error(msg);
             throw new DocumentNotFoundException(msg);
         }
-        
+
         String objectId = getObjectId(ctx);
         if (logger.isDebugEnabled()) {
             logger.debug("delete: using objectId=" + objectId);
@@ -272,8 +271,8 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
         if (logger.isDebugEnabled()) {
             logger.debug("delete: using object class=" + objectClass.getName());
         }
-        
-       JPATransactionContext jpaConnectionContext = (JPATransactionContext)ctx.openConnection();       
+
+       JPATransactionContext jpaConnectionContext = (JPATransactionContext)ctx.openConnection();
         try {
             StringBuilder deleteStr = new StringBuilder("DELETE FROM ");
             String entityName = getEntityName(ctx);
@@ -321,8 +320,8 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
     public boolean delete(ServiceContext ctx, String id, DocumentHandler handler)
             throws DocumentNotFoundException, DocumentException {
        boolean result = true;
-       
-       JPATransactionContext jpaTransactionContext = (JPATransactionContext)ctx.openConnection();      
+
+       JPATransactionContext jpaTransactionContext = (JPATransactionContext)ctx.openConnection();
         try {
                jpaTransactionContext.beginTransaction();
             handler.prepare(Action.DELETE);
@@ -349,7 +348,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
         } finally {
                ctx.closeConnection();
         }
-        
+
         return result;
     }
 
@@ -360,7 +359,7 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
      */
     protected String getObjectId(ServiceContext ctx) {
         String objectId = (String) ctx.getProperty(ServiceContextProperties.OBJECT_ID);
-        
+
         if (objectId == null) {
             String msg = ServiceContextProperties.OBJECT_ID + " property is missing in the context";
             logger.error(msg);
@@ -377,13 +376,13 @@ public class JpaRelationshipStorageClient<T> extends JpaStorageClientImpl {
      */
     protected Class getObjectClass(ServiceContext ctx) {
         Class objectClass = (Class) ctx.getProperty(ServiceContextProperties.OBJECT_CLASS);
-        
+
         if (objectClass == null) {
             String msg = ServiceContextProperties.OBJECT_CLASS + " property is missing in the context";
             logger.error(msg);
             throw new IllegalArgumentException(msg);
         }
-        
+
         return objectClass;
     }
 
index 8007f3ad0db1e70956d9be4e07738613d27360b8..4bc6844211429bfa254ef6a4ecfb93e66071a2ed 100644 (file)
@@ -6,6 +6,7 @@ import java.io.InputStream;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
+import javax.servlet.ReadListener;
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
@@ -16,17 +17,24 @@ import javax.ws.rs.core.MediaType;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.lang.NotImplementedException;
 
 /**
- * <p>A filter that translates JSON requests to XML.</p>
- * 
- * <p>This filter only has an effect if the content of the request (determined from
+ * <p>
+ * A filter that translates JSON requests to XML.
+ * </p>
+ *
+ * <p>
+ * This filter only has an effect if the content of the request (determined from
  * the Content-type header) is JSON. If the content is JSON, the request is
- * wrapped.</p>
- * 
- * <p>The request wrapper changes the Content-type header to XML, and provides an
+ * wrapped.
+ * </p>
+ *
+ * <p>
+ * The request wrapper changes the Content-type header to XML, and provides an
  * input stream containing an XML translation of the original JSON request
- * content.</p>
+ * content.
+ * </p>
  */
 public class JsonToXmlFilter implements Filter {
 
@@ -34,21 +42,21 @@ public class JsonToXmlFilter implements Filter {
     public void init(FilterConfig filterConfig) throws ServletException {
 
     }
-    
+
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
-        
+
         if (RequestUtils.isJsonContent(httpRequest)) {
             // The request contains a JSON payload. Wrap the request.
-            
+
             RequestWrapper requestWrapper = new RequestWrapper(httpRequest);
 
             chain.doFilter(requestWrapper, response);
-        }
-        else {
+        } else {
             // The request doesn't contain a JSON payload. Just pass it along.
-            
+
             chain.doFilter(request, response);
         }
     }
@@ -57,10 +65,10 @@ public class JsonToXmlFilter implements Filter {
     public void destroy() {
 
     }
-    
+
     /**
-     * A request wrapper that has a content type of XML, and replaces the
-     * wrapped input stream with an XML translation.
+     * A request wrapper that has a content type of XML, and replaces the wrapped
+     * input stream with an XML translation.
      */
     public class RequestWrapper extends HttpServletRequestWrapper {
         public RequestWrapper(HttpServletRequest request) {
@@ -75,18 +83,18 @@ public class JsonToXmlFilter implements Filter {
         @Override
         public ServletInputStream getInputStream() throws IOException {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
-            
+
             try {
                 JsonToXmlStreamConverter converter = new JsonToXmlStreamConverter(super.getInputStream(), out);
                 converter.convert();
             } catch (XMLStreamException e) {
                 throw new IOException("error converting JSON stream to XML", e);
             }
-            
+
             return new InputStreamWrapper(out.toInputStream());
         }
     }
-    
+
     /**
      * A ServletInputStream that wraps another input stream.
      */
@@ -96,19 +104,34 @@ public class JsonToXmlFilter implements Filter {
          * The wrapped input stream.
          */
         private InputStream in;
-        
+
         /**
          * Creates an InputStreamWrapper that wraps a given input stream.
-         * 
+         *
          * @param in the input stream to wrap
          */
         public InputStreamWrapper(InputStream in) {
             this.in = in;
         }
-        
+
         @Override
         public int read() throws IOException {
             return in.read();
         }
+
+        @Override
+        public boolean isFinished() {
+            return false;
+        }
+
+        @Override
+        public boolean isReady() {
+            return false;
+        }
+
+        @Override
+        public void setReadListener(ReadListener listener) {
+            throw new NotImplementedException();
+        }
     }
 }
index 0a4c924383e20eb05dcff4843a9d2405dd1b4ab3..2e0575a5dfd267a46cff817fd83198cdda2b7e64 100644 (file)
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.JsonToken;
  * translator. It is instead a lightweight processor tuned for the kinds
  * of JSON generated by CSpace, and the particular transformations needed
  * to generate XML for CSpace.</p>
- * 
+ *
  * <p>
  * The conversion is performed as follows:
  * <ul>
@@ -38,7 +38,7 @@ import com.fasterxml.jackson.core.JsonToken;
  *
  * <p>This implementation is schema-unaware. It operates by examining only the input
  * document, without utilizing any XML schema information.</p>
- * 
+ *
  * <p>Example:</p>
  *
  * <p>
@@ -84,7 +84,7 @@ import com.fasterxml.jackson.core.JsonToken;
  * }
  * </pre>
  * </p>
- * 
+ *
  * <p>
  * XML
  * <pre>
@@ -119,23 +119,23 @@ import com.fasterxml.jackson.core.JsonToken;
  * &lt;/document&gt;
  * </pre>
  * </p>
- * 
+ *
  * <p>This implementation uses a streaming JSON parser and a streaming
  * XML writer to do a direct stream-to-stream conversion, without
  * building a complete in-memory representation of the document.</p>
  */
 public class JsonToXmlStreamConverter {
-    
+
     /**
      * The JSON parser used to parse the input stream.
      */
     protected JsonParser jsonParser;
-    
+
     /**
      * The XML writer used to write to the output stream.
      */
     protected XMLStreamWriter xmlWriter;
-    
+
     /**
      * A stack used to track the state of JSON parsing.
      * JsonField instances are pushed onto the stack as fields
@@ -145,11 +145,11 @@ public class JsonToXmlStreamConverter {
      * representation of the JSON document in memory.
      */
     protected Stack<JsonField> stack = new Stack<JsonField>();
-    
+
     /**
      * Creates an JsonToXmlStreamConverter that reads JSON from an input stream,
      * and writes XML to an output stream.
-     * 
+     *
      * @param in the JSON input stream
      * @param out the XML output stream
      * @throws JsonParseException
@@ -163,23 +163,23 @@ public class JsonToXmlStreamConverter {
         jsonParser = jsonFactory.createParser(in);
         xmlWriter = xmlFactory.createXMLStreamWriter(out);
     }
-    
+
     /**
      * Performs the conversion.
-     * 
+     *
      * @throws JsonParseException
      * @throws IOException
      * @throws XMLStreamException
      */
     public void convert() throws JsonParseException, IOException, XMLStreamException {
         xmlWriter.writeStartDocument();
-        
+
         // Read tokens from the input stream, and dispatch to handlers.
         // Handlers may write XML to the output stream.
-        
+
         while (jsonParser.nextToken() != null) {
             JsonToken token = jsonParser.currentToken();
-            
+
             switch(token) {
                 case FIELD_NAME:
                     onFieldName(jsonParser.getText());
@@ -217,27 +217,27 @@ public class JsonToXmlStreamConverter {
                 default:
             }
         }
-        
+
         xmlWriter.writeEndDocument();
     }
 
     /**
      * Event handler executed when a field name is encountered
      * in the input stream.
-     * 
+     *
      * @param name the field name
      */
     public void onFieldName(String name) {
         // Push the field onto the stack.
-        
+
         stack.push(new JsonField(name));
     }
-    
+
     /**
      * Event handler executed when a scalar field value is encountered
      * in the input stream. Boolean, integer, float, and null values are
      * converted to strings prior to being passed in.
-     * 
+     *
      * @param value the scalar value, as a string
      * @throws XMLStreamException
      * @throws IOException
@@ -245,26 +245,26 @@ public class JsonToXmlStreamConverter {
     public void onScalar(String value) throws XMLStreamException, IOException {
         JsonField field = stack.peek();
         String name = field.getName();
-        
+
         if (field.isScalar() && isXmlAttribute(name)) {
             // We're in a scalar field whose name looks like an XML attribute
             // or namespace declaration.
-            
+
             if (isXmlNamespace(name)) {
                 // It looks like a namespace declaration.
                 // Output an XML namespace declaration.
-                
+
                 String prefix = jsonFieldNameToXmlNamespacePrefix(name);
                 String namespaceUri = value;
-                
+
                 xmlWriter.writeNamespace(prefix, namespaceUri);
             }
             else {
                 // It looks like an attribute.
                 // Output an XML attribute.
-                
+
                 String localName = jsonFieldNameToXmlAttributeName(name);
-                
+
                 xmlWriter.writeAttribute(localName, value);
             }
         }
@@ -272,7 +272,7 @@ public class JsonToXmlStreamConverter {
             // It doesn't look like an XML attribute or namespace declaration.
             // Output an XML element with the same name as the field, whose
             // contents are the value.
-            
+
             xmlWriter.writeStartElement(name);
             xmlWriter.writeCharacters(value);
             xmlWriter.writeEndElement();
@@ -281,45 +281,45 @@ public class JsonToXmlStreamConverter {
         if (!field.isArray()) {
             // If the field we're in is not an array, we're done with it.
             // Pop it off the stack.
-            
+
             // If it is an array, there may be more values to come. The
             // field shouldn't be popped until the end of array is
             // found.
-            
+
             stack.pop();
         }
     }
-    
+
     /**
      * Event handler executed when an object start ({) is encountered
      * in the input stream.
-     * 
+     *
      * @throws XMLStreamException
      */
     public void onStartObject() throws XMLStreamException {
         if (stack.isEmpty()) {
             // This is the root object. Do nothing.
-            
+
             return;
         }
-        
+
         JsonField field = stack.peek();
-        
+
         if (field.isArray()) {
             // If we're in an array, an object should be expanded
             // into a field with the same name as the array.
-            
+
             field = new JsonField(field.getName());
             stack.push(field);
         }
-        
+
         field.setType(JsonField.Type.OBJECT);
-        
+
         // Write an XML start tag to the output stream.
-        
+
         xmlWriter.writeStartElement(field.getName());
     }
-    
+
     /**
      * Event handler executed when an object end (}) is encountered
      * in the input stream.
@@ -329,19 +329,19 @@ public class JsonToXmlStreamConverter {
     public void onEndObject() throws XMLStreamException {
         if (stack.isEmpty()) {
             // This is the root object. Do nothing.
-            
+
             return;
         }
 
         // Pop the current field off the stack.
-        
+
         stack.pop();
-        
+
         // Write an XML end tag to the output stream.
-        
+
         xmlWriter.writeEndElement();
     }
-    
+
     /**
      * Event handler executed when an array start ([) is encountered
      * in the input stream.
@@ -351,12 +351,12 @@ public class JsonToXmlStreamConverter {
      */
     public void onStartArray() throws IOException, XMLStreamException {
         // Set the current field type to array.
-        
+
         JsonField field = stack.peek();
-        
+
         field.setType(JsonField.Type.ARRAY);
     }
-    
+
     /**
      * Event handler executed when an array end (]) is encountered
      * in the input stream.
@@ -365,8 +365,7 @@ public class JsonToXmlStreamConverter {
      */
     public void onEndArray() throws XMLStreamException {
        // Pop the current field off the stack.
-       
+
        stack.pop();
     }
 }
-
index 465e7044507b56e12c9d30bbc470f73240d55af4..d415f0acc8ba2e9c8e72b3c08ee43ff198b1e4aa 100644 (file)
@@ -15,6 +15,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
@@ -26,28 +27,37 @@ import javax.xml.stream.XMLStreamException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * <p>A filter that translates XML responses to JSON.</p>
- * 
- * <p>This filter only has an effect if the preferred content type of the response
+ * <p>
+ * A filter that translates XML responses to JSON.
+ * </p>
+ *
+ * <p>
+ * This filter only has an effect if the preferred content type of the response
  * (determined from the Accept header) is JSON. If JSON is preferred, both the
- * request and response are wrapped.</p>
- * 
- * <p>The request wrapper modifies the Accept header, ensuring that XML is accepted
+ * request and response are wrapped.
+ * </p>
+ *
+ * <p>
+ * The request wrapper modifies the Accept header, ensuring that XML is accepted
  * in addition to (but at a lower quality factor than) JSON. This handles the
  * case where the original request only accepts JSON. In that case, XML should
  * also be accepted, so that the XML response may be translated to JSON on the
- * way back.</p>
- * 
- * <p>The response wrapper provides a buffered output stream, so that XML output
- * is captured before being sent over the network. If the content type of the
+ * way back.
+ * </p>
+ *
+ * <p>
+ * The response wrapper provides a buffered output stream, so that XML output is
+ * captured before being sent over the network. If the content type of the
  * response is XML, the content type is changed to JSON, the content of the
  * buffer is translated to JSON, and the JSON is written to the original output
  * stream. If the content type of the response is not XML, the content type is
- * not changed, and the content of the buffer is written to the original
- * output stream unchanged.</p>
+ * not changed, and the content of the buffer is written to the original output
+ * stream unchanged.
+ * </p>
  */
 public class XmlToJsonFilter implements Filter {
 
@@ -55,49 +65,48 @@ public class XmlToJsonFilter implements Filter {
     public void init(FilterConfig filterConfig) throws ServletException {
 
     }
-    
+
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
         if (RequestUtils.isJsonPreferred((HttpServletRequest) request)) {
             // The request prefers a JSON response. Wrap the request and response.
-            
+
             RequestWrapper requestWrapper = new RequestWrapper((HttpServletRequest) request);
             ResponseWrapper responseWrapper = new ResponseWrapper((HttpServletResponse) response);
 
             chain.doFilter(requestWrapper, responseWrapper);
-            
+
             if (StringUtils.equals(responseWrapper.getContentType(), MediaType.APPLICATION_XML)) {
                 // Got an XML response. Translate it to JSON.
-                
+
                 response.setContentType(MediaType.APPLICATION_JSON);
-                
+
                 try {
                     InputStream xmlInputStream = responseWrapper.getBuffer().toInputStream();
-                    
+
                     if (xmlInputStream != null) {
                         OutputStream jsonOutputStream = response.getOutputStream();
-                        XmlToJsonStreamConverter converter = new XmlToJsonStreamConverter(xmlInputStream, jsonOutputStream);
-                        
+                        XmlToJsonStreamConverter converter = new XmlToJsonStreamConverter(xmlInputStream,
+                                jsonOutputStream);
+
                         converter.convert();
                     }
-                }
-                catch (XMLStreamException e) {
+                } catch (XMLStreamException e) {
                     throw new WebApplicationException("Error generating JSON", e);
                 }
-            }
-            else {
+            } else {
                 // Didn't get an XML response. Just pass it along.
-                
+
                 if (responseWrapper.getBuffer() != null) {
                     InputStream inputStream = responseWrapper.getBuffer().toInputStream();
-                
+
                     IOUtils.copy(inputStream, response.getOutputStream());
                 }
             }
-        }
-        else {
+        } else {
             // The request doesn't prefer a JSON response. Just pass it along.
-            
+
             chain.doFilter(request, response);
         }
     }
@@ -106,17 +115,17 @@ public class XmlToJsonFilter implements Filter {
     public void destroy() {
 
     }
-    
+
     /**
-     * A request wrapper that enhances the original Accept header so that
-     * it accepts XML (if it did not already accept XML).
+     * A request wrapper that enhances the original Accept header so that it accepts
+     * XML (if it did not already accept XML).
      */
     public class RequestWrapper extends HttpServletRequestWrapper {
         private String xmlEnsuredAccept;
-        
+
         public RequestWrapper(HttpServletRequest request) {
             super(request);
-            
+
             xmlEnsuredAccept = RequestUtils.getXmlEnsuredAccept(request);
         }
 
@@ -129,7 +138,7 @@ public class XmlToJsonFilter implements Filter {
             return super.getHeaders(name);
         }
     }
-    
+
     /**
      * A response wrapper that replaces the wrapped output stream with a buffered
      * stream so that output is captured.
@@ -137,7 +146,7 @@ public class XmlToJsonFilter implements Filter {
     public class ResponseWrapper extends HttpServletResponseWrapper {
         private BufferedServletOutputStream outputStream;
         private PrintWriter writer;
-        
+
         public ResponseWrapper(HttpServletResponse response) {
             super(response);
         }
@@ -147,11 +156,11 @@ public class XmlToJsonFilter implements Filter {
             if (writer != null) {
                 throw new IllegalStateException("getWriter has already been called on this response");
             }
-            
+
             if (outputStream == null) {
                 outputStream = new BufferedServletOutputStream();
             }
-            
+
             return outputStream;
         }
 
@@ -160,58 +169,67 @@ public class XmlToJsonFilter implements Filter {
             if (outputStream != null && writer == null) {
                 throw new IllegalStateException("getOutputStream has already been called on this response");
             }
-            
+
             if (outputStream == null) {
                 outputStream = new BufferedServletOutputStream();
             }
-            
+
             if (writer == null) {
                 writer = new PrintWriter(outputStream);
             }
 
             return writer;
         }
-        
+
         /**
          * Returns the internal buffer stream.
-         * 
+         *
          * @return the buffer stream
          */
         public ByteArrayOutputStream getBuffer() {
             if (outputStream == null) {
                 return null;
             }
-            
+
             return outputStream.getBuffer();
         }
     }
-    
+
     /**
-     * A ServletOutputStream that wraps a ByteArrayOutputStream.
-     * Any bytes written are sent to the ByteArrayOutputStream,
-     * which acts as a buffer.
+     * A ServletOutputStream that wraps a ByteArrayOutputStream. Any bytes written
+     * are sent to the ByteArrayOutputStream, which acts as a buffer.
      */
     public class BufferedServletOutputStream extends ServletOutputStream {
         /*
          * The buffer.
-         * 
-         * ByteArrayOutputStream from commons-io provides better
-         * performance than the one from java.io.
+         *
+         * ByteArrayOutputStream from commons-io provides better performance than the
+         * one from java.io.
          */
         private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        
+
         @Override
         public void write(int b) throws IOException {
             buffer.write(b);
         }
-        
+
         /**
          * Returns the buffer stream.
-         * 
+         *
          * @return the buffer stream
          */
         public ByteArrayOutputStream getBuffer() {
             return buffer;
         }
+
+        @Override
+        public boolean isReady() {
+            return false;
+        }
+
+        @Override
+        public void setWriteListener(WriteListener listener) {
+            throw new NotImplementedException();
+        }
     }
 }
index 3e1e6cc29793f1329d468afcb762e310fbe1d05e..9f15b782b8e101dff10ee83e406ca6ea79cfa41c 100644 (file)
@@ -7,6 +7,7 @@ import java.util.Iterator;
 
 import javax.servlet.ServletContext;
 
+import org.apache.catalina.util.ServerInfo;
 import org.collectionspace.services.common.api.JEEServerDeployment;
 import org.collectionspace.services.config.RepositoryClientConfigType;
 import org.collectionspace.services.config.tenant.RepositoryDomainType;
@@ -18,8 +19,9 @@ import org.nuxeo.ecm.core.api.DocumentModelList;
 import org.nuxeo.ecm.core.api.SystemPrincipal;
 import org.nuxeo.ecm.core.api.repository.Repository;
 import org.nuxeo.ecm.core.api.repository.RepositoryManager;
-import org.nuxeo.osgi.application.FrameworkBootstrap;
+import org.nuxeo.osgi.application.MutableClassLoaderDelegate;
 import org.nuxeo.runtime.api.Framework;
+import org.nuxeo.runtime.transaction.TransactionHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,15 +35,15 @@ public class NuxeoConnectorEmbedded {
        public final static String NUXEO_CLIENT_DIR = JEEServerDeployment.NUXEO_CLIENT_DIR;
        public final static String NUXEO_SERVER_DIR = JEEServerDeployment.NUXEO_SERVER_DIR;
        private final static String ERROR_CONNECTOR_NOT_INITIALIZED = "NuxeoConnector is not initialized!";
-               
+
        private final static String CSPACE_NUXEO_HOME = "CSPACE_NUXEO_HOME";
-       
+
        private static final NuxeoConnectorEmbedded self = new NuxeoConnectorEmbedded();
        private NuxeoClientEmbedded client;
        private volatile boolean initialized = false; // use volatile for lazy
                                                                                                        // initialization in
                                                                                                        // singleton
-       public FrameworkBootstrap fb;
+       public NuxeoFrameworkBootstrap fb;
        private ServletContext servletContext;
        private RepositoryClientConfigType repositoryClientConfig;
 
@@ -52,7 +54,7 @@ public class NuxeoConnectorEmbedded {
        public final static NuxeoConnectorEmbedded getInstance() {
                return self;
        }
-       
+
        private String getNuxeoServerPath(String serverRootPath) throws IOException {
                String result = null;
                //
@@ -68,14 +70,14 @@ public class NuxeoConnectorEmbedded {
                        //
                        result = serverRootPath + "/" + NUXEO_SERVER_DIR;
                }
-               
+
                return result;
        }
-       
+
        private File getNuxeoServerDir(String serverRootPath) throws IOException {
                File result = null;
                String errMsg = null;
-               
+
                String path = getNuxeoServerPath(serverRootPath);
                if (path != null) {
                        File temp = new File(path);
@@ -85,7 +87,7 @@ public class NuxeoConnectorEmbedded {
                                errMsg = "The Nuxeo EP configuration directory is missing or inaccessible at: '" + path + "'.";
                        }
                }
-               
+
                if (result == null) {
                        if (errMsg == null) {
                                path = path != null ? path : "<empty>";
@@ -95,7 +97,7 @@ public class NuxeoConnectorEmbedded {
                        }
                        throw new IOException(errMsg);
                }
-               
+
                return result;
        }
 
@@ -109,17 +111,25 @@ public class NuxeoConnectorEmbedded {
                        logger.info("Starting Nuxeo EP server from configuration at: "
                                        + nuxeoHomeDir.getCanonicalPath());
                }
-               
-               fb = new FrameworkBootstrap(NuxeoConnectorEmbedded.class.getClassLoader(),
-                               nuxeoHomeDir);
+
+               ClassLoader cl = NuxeoConnectorEmbedded.class.getClassLoader();
+
+               fb = new NuxeoFrameworkBootstrap(cl, nuxeoHomeDir);
                fb.setHostName("Tomcat");
-               fb.setHostVersion("7.0.64"); //FIXME: Should not be hard coded.
-               
+               fb.setHostVersion(ServerInfo.getServerNumber());
+
                fb.initialize();
-               fb.start();
-               
+               fb.start(new MutableClassLoaderDelegate(cl));
+
                // Test to see if we can connect to the default repository
+               boolean transactionStarted = false;
+
+               if (!TransactionHelper.isTransactionActiveOrMarkedRollback()) {
+                               transactionStarted = TransactionHelper.startTransaction();
+               }
+
                CoreSession coreSession = null;
+
                try {
                        Repository defaultRepo = Framework.getService(RepositoryManager.class).getDefaultRepository();
                        coreSession = CoreInstance.openCoreSession(defaultRepo.getName(), new SystemPrincipal(null));
@@ -130,12 +140,16 @@ public class NuxeoConnectorEmbedded {
                        if (coreSession != null) {
                                CoreInstance.closeCoreSession(coreSession);
                        }
+
+                       if (transactionStarted) {
+                               TransactionHelper.commitOrRollbackTransaction();
+                       }
                }
        }
 
        /**
         * release releases resources occupied by Nuxeo remoting client runtime
-        * 
+        *
         * @throws java.lang.Exception
         */
        public void release() throws Exception {
@@ -164,10 +178,10 @@ public class NuxeoConnectorEmbedded {
                        }
                }
        }
-       
+
        /**
         * releaseRepositorySession releases given repository session
-        * 
+        *
         * @param repoSession
         * @throws java.lang.Exception
         */
@@ -184,23 +198,23 @@ public class NuxeoConnectorEmbedded {
 
        /**
         * getRepositorySession get session to default repository
-        * 
+        *
         * @return RepositoryInstance
         * @throws java.lang.Exception
         */
        public CoreSessionInterface getRepositorySession(RepositoryDomainType repoDomain) throws Exception {
                CoreSessionInterface repoSession = getClient().openRepository(repoDomain);
-               
+
                if (logger.isDebugEnabled() && repoSession != null) {
                        String repoName = repoDomain.getRepositoryName();
-                       logger.debug("getRepositorySession() opened repository session on: %s repo", 
-                                       repoName != null ? repoName : "unknown");                       
+                       logger.debug("getRepositorySession() opened repository session on: %s repo",
+                                       repoName != null ? repoName : "unknown");
                }
-               
+
                return repoSession;
        }
 
-    
+
 // TODO: Remove after CSPACE-6375 issue is resolved.
 //    public List<RepositoryDescriptor> getRepositoryDescriptor(String name) throws Exception {
 //     RepositoryDescriptor repo = null;
@@ -214,11 +228,11 @@ public class NuxeoConnectorEmbedded {
 //
 //        return repo;
 //    }
-       
+
        /**
         * getClient get Nuxeo client for accessing Nuxeo services remotely using
         * Nuxeo Java (EJB) Remote APIS
-        * 
+        *
         * @return NuxeoClient
         * @throws java.lang.Exception
         */
@@ -232,7 +246,7 @@ public class NuxeoConnectorEmbedded {
                logger.error(ERROR_CONNECTOR_NOT_INITIALIZED);
                throw new IllegalStateException(ERROR_CONNECTOR_NOT_INITIALIZED);
        }
-       
+
        void releaseClient() throws Exception {
                if (initialized == true) {
                        // Do nothing.
@@ -247,7 +261,7 @@ public class NuxeoConnectorEmbedded {
 
        /**
         * retrieveWorkspaceIds retrieves all workspace ids from default repository
-        * 
+        *
         * @param repoDomain
         *            a repository domain for a given tenant - see the tenant bindings XML file for details
         * @return
@@ -275,7 +289,7 @@ public class NuxeoConnectorEmbedded {
                                Iterator<DocumentModel> witer = domainChildrenList.iterator();
                                while (witer.hasNext()) {
                                        DocumentModel childNode = witer.next();
-                                       if (NuxeoUtils.Workspaces.equalsIgnoreCase(childNode.getName())) { 
+                                       if (NuxeoUtils.Workspaces.equalsIgnoreCase(childNode.getName())) {
                                                DocumentModelList workspaceList = repoSession
                                                                .getChildren(childNode.getRef());
                                                Iterator<DocumentModel> wsiter = workspaceList
@@ -303,7 +317,7 @@ public class NuxeoConnectorEmbedded {
                                releaseRepositorySession(repoSession);
                        }
                }
-               
+
                return workspaceIds;
-       }       
+       }
 }
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoFrameworkBootstrap.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoFrameworkBootstrap.java
new file mode 100644 (file)
index 0000000..4f0104f
--- /dev/null
@@ -0,0 +1,62 @@
+/**
+ *  This document is a part of the source code and related artifacts
+ *  for CollectionSpace, an open source collections management system
+ *  for museums and related institutions:
+
+ *  http://www.collectionspace.org
+ *  http://wiki.collectionspace.org
+
+ *  Copyright 2019 LYRASIS
+
+ *  Licensed under the Educational Community License (ECL), Version 2.0.
+ *  You may not use this file except in compliance with this License.
+
+ *  You may obtain a copy of the ECL 2.0 License at
+
+ *  https://source.collectionspace.org/collection-space/LICENSE.txt
+
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.collectionspace.services.nuxeo.client.java;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import javax.management.JMException;
+
+import org.nuxeo.osgi.application.FrameworkBootstrap;
+import org.nuxeo.osgi.application.MutableClassLoader;
+
+public class NuxeoFrameworkBootstrap extends FrameworkBootstrap {
+    public NuxeoFrameworkBootstrap(ClassLoader cl, File home) throws IOException {
+        super(cl, home);
+    }
+
+    public NuxeoFrameworkBootstrap(MutableClassLoader loader, File home) throws IOException {
+        super(loader, home);
+    }
+
+    @Override
+    public void start(MutableClassLoader cl) throws ReflectiveOperationException, IOException, JMException {
+        if (frameworkLoaderClass == null) {
+            throw new IllegalStateException("Framework Loader was not initialized. Call initialize() method first");
+        }
+        Method start = frameworkLoaderClass.getMethod("start");
+        start.invoke(null);
+        printStartedMessage();
+    }
+
+    @Override
+    public void stop(MutableClassLoader cl) throws ReflectiveOperationException, JMException {
+        if (frameworkLoaderClass == null) {
+            throw new IllegalStateException("Framework Loader was not initialized. Call initialize() method first");
+        }
+        Method stop = frameworkLoaderClass.getMethod("stop");
+        stop.invoke(null);
+    }
+}
index 1822f3fdb8452d12a0a11022b113deead8513734..187fa057ceffca4039c7509ccd8975dac21fe97f 100644 (file)
@@ -98,7 +98,7 @@ import org.slf4j.LoggerFactory;
  * $LastChangedRevision: $ $LastChangedDate: $
  */
 public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxPayloadOut> {
-       
+
     /**
      * The logger.
      */
@@ -116,7 +116,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     public static final String ENDING_ANCHOR_CHAR = "$";
     public static final String ENDING_ANCHOR_CHAR_REGEX = BACKSLASH + ENDING_ANCHOR_CHAR;
 
-    
+
     /**
      * Instantiates a new repository java client impl.
      */
@@ -188,7 +188,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             DocumentModel wspaceDoc = repoSession.getDocument(nuxeoWspace);
             String wspacePath = wspaceDoc.getPathAsString();
             //give our own ID so PathRef could be constructed later on
-            String id = IdUtils.generateId(UUID.randomUUID().toString());
+            String id = IdUtils.generateId(UUID.randomUUID().toString(), "-", true, 24);
             // create document model
             DocumentModel doc = repoSession.createDocumentModel(wspacePath, id, docType);
             /* Check for a versioned document, and check In and Out before we proceed.
@@ -205,7 +205,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             doc = repoSession.createDocument(doc);
             repoSession.save();
                        // TODO for sub-docs need to call into the handler to let it deal with subitems. Pass in the id,
-                       // and assume the handler has the state it needs (doc fragments). 
+                       // and assume the handler has the state it needs (doc fragments).
             handler.complete(Action.CREATE, wrapDoc);
             return id;
         } catch (BadRequestException bre) {
@@ -223,20 +223,20 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             }
         }
     }
-    
+
        @Override
     public boolean reindex(DocumentHandler handler, String indexid) throws DocumentNotFoundException, DocumentException
     {
        return reindex(handler, null, indexid);
     }
-    
+
     @Override
     public boolean reindex(DocumentHandler handler, String csid, String indexid) throws DocumentNotFoundException, DocumentException
     {
        boolean result = true;
         CoreSessionInterface repoSession = null;
         ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = handler.getServiceContext();
-        
+
         try {
             String queryString = handler.getDocumentsToIndexQuery(indexid, csid);
             repoSession = getRepositorySession(ctx);
@@ -256,15 +256,15 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 releaseRepositorySession(ctx, repoSession);
             }
         }
-        
+
        return result;
     }
-    
+
     @Override
     public boolean synchronize(ServiceContext ctx, Object specifier, DocumentHandler handler)
             throws DocumentNotFoundException, TransactionException, DocumentException {
        boolean result = false;
-       
+
         if (handler == null) {
             throw new IllegalArgumentException("RepositoryJavaClient.get: handler is missing");
         }
@@ -294,15 +294,15 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 releaseRepositorySession(ctx, repoSession);
             }
         }
-        
+
         return result;
     }
-    
+
     @Override
     public boolean synchronizeItem(ServiceContext ctx, AuthorityItemSpecifier itemSpecifier, DocumentHandler handler)
             throws DocumentNotFoundException, TransactionException, DocumentException {
        boolean result = false;
-       
+
         if (handler == null) {
             throw new IllegalArgumentException(
                     "RepositoryJavaClient.get: handler is missing");
@@ -330,10 +330,10 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 releaseRepositorySession(ctx, repoSession);
             }
         }
-        
+
         return result;
     }
-    
+
     /**
      * get document from the Nuxeo repository
      *
@@ -753,11 +753,11 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     private DocumentModelList getFilteredCMISForSubjectOrObject(CoreSessionInterface repoSession,
                        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx, DocumentHandler handler, QueryContext queryContext) throws DocumentNotFoundException, DocumentException {
        DocumentModelList result = null;
-       
+
        if (isSubjectOrObjectQuery(ctx) == true) {
                MultivaluedMap<String, String> queryParams = ctx.getQueryParams();
                String asEitherCsid = (String)queryParams.getFirst(IQueryManager.SEARCH_RELATED_TO_CSID_AS_EITHER);
-               
+
                queryParams.remove(IQueryManager.SEARCH_RELATED_TO_CSID_AS_SUBJECT);
                queryParams.remove(IQueryManager.SEARCH_RELATED_TO_CSID_AS_OBJECT);
 
@@ -767,7 +767,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                queryParams.addFirst(IQueryManager.SEARCH_RELATED_TO_CSID_AS_SUBJECT, asEitherCsid);
             DocumentModelList subjectDocList = getFilteredCMIS(repoSession, ctx, handler, queryContext);
             queryParams.remove(IQueryManager.SEARCH_RELATED_TO_CSID_AS_SUBJECT);
-            
+
                //
                // Next query for objectCsid results.
                //
@@ -780,31 +780,31 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             //
             result = mergeDocumentModelLists(subjectDocList, objectDocList);
        }
-       
+
                return result;
        }
 
        private DocumentModelList mergeDocumentModelLists(DocumentModelList subjectDocList,
                        DocumentModelList objectDocList) {
                DocumentModelList result = null;
-               
+
                if (subjectDocList == null || subjectDocList.isEmpty()) {
                        return objectDocList;
                }
-               
+
                if (objectDocList == null || objectDocList.isEmpty()) {
                        return subjectDocList;
                }
-               
+
         result = new DocumentModelListImpl();
-        
+
         // Add the subject list
                Iterator<DocumentModel> iterator = subjectDocList.iterator();
                while (iterator.hasNext()) {
                        DocumentModel dm = iterator.next();
                        addToResults(result, dm);
                }
-               
+
                // Add the object list
                iterator = objectDocList.iterator();
                while (iterator.hasNext()) {
@@ -823,7 +823,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
        private void addToResults(DocumentModelList result, DocumentModel dm) {
                Iterator<DocumentModel> iterator = result.iterator();
                boolean found = false;
-               
+
                while (iterator.hasNext()) {
                        DocumentModel existingDm = iterator.next();
                        if (existingDm.getId().equals(dm.getId())) {
@@ -831,7 +831,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                                break;
                        }
                }
-               
+
                if (found == false) {
                        result.add(dm);
                }
@@ -867,12 +867,12 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
 
         try {
             repoSession = getRepositorySession(ctx);
-            wrapDoc = findDocs(ctx, 
-                    repoSession, 
-                    docTypes, 
-                    whereClause, 
+            wrapDoc = findDocs(ctx,
+                    repoSession,
+                    docTypes,
+                    whereClause,
                     null,
-                    pageNum, 
+                    pageNum,
                     pageSize,
                     useDefaultOrderByClause,
                     computeTotal);
@@ -1013,7 +1013,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
      * A method to find a CollectionSpace document (of any type) given just a service context and
      * its CSID.  A search across *all* service workspaces (within a given tenant context) is performed to find
      * the document
-     * 
+     *
      * This query searches Nuxeo's Hierarchy table where our CSIDs are stored in the "name" column.
      */
     @Override
@@ -1060,7 +1060,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         IterableQueryResult result = null;
         /** Threshold over which temporary files are not kept in memory. */
         final int THRESHOLD = 1024 * 1024;
-        
+
         try {
             logger.debug(String.format("Performing a CMIS query on Nuxeo repository named %s",
                        repoSession.getRepositoryName()));
@@ -1077,7 +1077,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                     new NuxeoCmisServiceFactory(),
                     streamFactory);
             callContext.put(CallContext.USERNAME, repoSession.getPrincipal().getName());
-            
+
             NuxeoCmisService cmisService = new NuxeoCmisService(repoSession.getCoreSession());
             result = repoSession.queryAndFetch(query, "CMISQL", cmisService);
         } catch (ClientException e) {
@@ -1125,7 +1125,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 if (isSubjectOrObjectQuery(ctx)) {
                        docList = getFilteredCMISForSubjectOrObject(repoSession, ctx, handler, queryContext);
                 } else {
-                    docList = getFilteredCMIS(repoSession, ctx, handler, queryContext); 
+                    docList = getFilteredCMIS(repoSession, ctx, handler, queryContext);
                 }
             // NXQL query
             } else {
@@ -1170,21 +1170,21 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     /**
      * Perform a database query, via JDBC and SQL, to retrieve matching records
      * based on filter criteria.
-     * 
+     *
      * Although this method currently has a general-purpose name, it is
      * currently dedicated to a specific task: that of improving performance
      * for partial term matching queries on authority items / terms, via
      * the use of a hand-tuned SQL query, rather than via the generated SQL
      * produced by Nuxeo from an NXQL query.  (See CSPACE-6361 for a task
      * to generalize this method.)
-     * 
+     *
      * @param repoSession a repository session.
      * @param ctx the service context.
      * @param handler a relevant document handler.
      * @return a list of document models matching the search criteria.
-     * @throws Exception 
+     * @throws Exception
      */
-    private DocumentModelList getFilteredJDBC(CoreSessionInterface repoSession, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx, 
+    private DocumentModelList getFilteredJDBC(CoreSessionInterface repoSession, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
             DocumentHandler handler) throws Exception {
         DocumentModelList result = new DocumentModelListImpl();
 
@@ -1197,11 +1197,11 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         final String IN_AUTHORITY_PARAM = "IN_AUTHORITY";
         // Get this from a constant in AuthorityResource or equivalent
         final String PARENT_WILDCARD = "_ALL_";
-        
+
         // Build two SQL statements, to be executed within a single transaction:
         // the first statement to control join order, and the second statement
         // representing the actual 'get filtered' query
-        
+
         // Build the join control statement
         //
         // Per http://www.postgresql.org/docs/9.2/static/runtime-config-query.html#GUC-JOIN-COLLAPSE-LIMIT
@@ -1216,14 +1216,14 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         // in consistently slower-than-desired query performance where zero or
         // very few records were retrieved. See notes on CSPACE-5945. - ADR 2013-04-09
         // String joinControlSql = "SET LOCAL join_collapse_limit TO 1;";
-        
+
         // Build the query statement
         //
         // Start with the default query
         String selectStatement =
                 "SELECT DISTINCT commonschema.id"
                 + " FROM " + handler.getServiceContext().getCommonPartLabel() + " commonschema";
-        
+
         String joinClauses =
                 " INNER JOIN misc"
                 + "  ON misc.id = commonschema.id"
@@ -1245,7 +1245,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
            whereClause =
                 " WHERE (termgroup.termdisplayname ILIKE ?)";
         }
-        
+
         // At present, results are ordered in code, below, rather than in SQL,
         // and the orderByClause below is thus intentionally blank.
         //
@@ -1253,7 +1253,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         // 'ORDER BY termgroup.termdisplayname', the relevant column
         // must be returned by the SELECT statement.
         String orderByClause = "";
-        
+
         String limitClause;
         TenantBindingConfigReaderImpl tReader =
                 ServiceMain.getInstance().getTenantBindingConfigReader();
@@ -1262,15 +1262,15 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 IQueryManager.MAX_LIST_ITEMS_RETURNED_LIMIT_ON_JDBC_QUERIES);
         limitClause =
                 " LIMIT " + getMaxItemsLimitOnJdbcQueries(maxListItemsLimit); // implicit int-to-String conversion
-        
+
         // After building the individual parts of the query, set the values
         // of replaceable parameters that will be inserted into that query
         // and optionally add restrictions
-        
+
         List<String> params = new ArrayList<>();
-        
+
         if (Tools.notBlank(whereClause)) {
-                        
+
             // Read tenant bindings configuration to determine whether
             // to automatically insert leading, as well as trailing, wildcards
             // into the term matching string.
@@ -1314,10 +1314,10 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             }
             params.add(partialTerm);
         }
-        
+
         // Optionally add restrictions to the default query, based on variables
         // in the current request
-        
+
         // Restrict the query to filter out deleted records, if requested
         String includeDeleted = queryParams.getFirst(WorkflowClient.WORKFLOW_QUERY_DELETED_QP);
         if (includeDeleted != null && includeDeleted.equalsIgnoreCase(Boolean.FALSE.toString())) {
@@ -1339,14 +1339,14 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 params.add(inAuthorityValue); // Value for replaceable parameter 2 in the query
             }
         }
-        
+
         // Restrict the query further to return only records pertaining to
         // the current tenant, unless:
         // * Data for this service, in this tenant, is stored in its own,
         //   separate repository, rather than being intermingled with other
         //   tenants' data in the default repository; or
         // * Restriction by tenant ID in JDBC queries has been disabled,
-        //   via configuration for this tenant, 
+        //   via configuration for this tenant,
         if (restrictJDBCQueryByTenantID(tenantBinding, ctx)) {
                 joinClauses = joinClauses
                     + " INNER JOIN collectionspace_core core"
@@ -1355,10 +1355,10 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                     + "  AND (core.tenantid = ?)";
                 params.add(ctx.getTenantId()); // Value for replaceable parameter 3 in the query
         }
-        
+
         // Piece together the SQL query from its parts
         String querySql = selectStatement + joinClauses + whereClause + orderByClause + limitClause;
-        
+
         // Note: PostgreSQL 9.2 introduced a change that may improve performance
         // of certain queries using JDBC PreparedStatements.  See comments on
         // CSPACE-5943 for details.
@@ -1389,7 +1389,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             // out as per comments above) will not return results, so query results
             // will be the first set of results (rowSet) returned in the list
             CachedRowSet queryResults = resultsList.get(0);
-            
+
             // If the result from executing the query is null or contains zero rows,
             // return an empty list of document models
             if (queryResults == null) {
@@ -1412,7 +1412,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         } catch (SQLException sqle) {
             logger.warn("Could not obtain document IDs via SQL query '" + querySql + "': " + sqle.getMessage());
             return result; // return an empty list of document models
-        } 
+        }
 
         // Get a list of document models, using the list of IDs obtained from the query
         //
@@ -1428,7 +1428,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 result.add(docModel);
             }
         }
-        
+
         // Order the results
         final String COMMON_PART_SCHEMA = handler.getServiceContext().getCommonPartLabel();
         final String DISPLAY_NAME_XPATH =
@@ -1450,9 +1450,9 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
 
         return result;
     }
-    
 
-    private DocumentModelList getFilteredCMIS(CoreSessionInterface repoSession, 
+
+    private DocumentModelList getFilteredCMIS(CoreSessionInterface repoSession,
                ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx, DocumentHandler handler, QueryContext queryContext)
             throws DocumentNotFoundException, DocumentException {
 
@@ -1580,7 +1580,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             }
             // Check for a versioned document, and check In and Out before we proceed.
             if (((DocumentModelHandler) handler).supportsVersioning()) {
-                /* Once we advance to 5.5 or later, we can add this. 
+                /* Once we advance to 5.5 or later, we can add this.
                  * See also https://jira.nuxeo.com/browse/NXP-8506
                  if(!doc.isVersionable()) {
                  throw new NuxeoDocumentException("Configuration for: "
@@ -1693,8 +1693,8 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     }
 
     @Override
-       public void deleteWithWhereClause(@SuppressWarnings("rawtypes") ServiceContext ctx, String whereClause, 
-                       @SuppressWarnings("rawtypes") DocumentHandler handler) throws 
+       public void deleteWithWhereClause(@SuppressWarnings("rawtypes") ServiceContext ctx, String whereClause,
+                       @SuppressWarnings("rawtypes") DocumentHandler handler) throws
                        DocumentNotFoundException, DocumentException {
         if (ctx == null) {
             throw new IllegalArgumentException(
@@ -1703,7 +1703,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         if (logger.isDebugEnabled()) {
             logger.debug("Deleting document with whereClause=" + whereClause);
         }
-        
+
         DocumentWrapper<DocumentModel> foundDocWrapper = this.findDoc(ctx, whereClause);
         if (foundDocWrapper != null) {
                DocumentModel docModel = foundDocWrapper.getWrappedObject();
@@ -1711,7 +1711,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                this.delete(ctx, csid, handler);
         }
     }
-    
+
     /**
      * delete a document from the Nuxeo repository
      *
@@ -1723,7 +1723,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     public boolean delete(ServiceContext ctx, List<String> idList, DocumentHandler handler) throws DocumentNotFoundException,
             DocumentException, TransactionException {
        boolean result = true;
-       
+
         if (ctx == null) {
             throw new IllegalArgumentException(
                     "delete(ctx, ix, handler): ctx is missing");
@@ -1732,12 +1732,12 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             throw new IllegalArgumentException(
                     "delete(ctx, ix, handler): handler is missing");
         }
-                
+
         CoreSessionInterface repoSession = null;
         try {
             handler.prepare(Action.DELETE);
             repoSession = getRepositorySession(ctx);
-            
+
             for (String id : idList) {
                 if (logger.isDebugEnabled()) {
                     logger.debug("Deleting document with CSID=" + id);
@@ -1761,7 +1761,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                        }
                    } catch (org.nuxeo.ecm.core.api.DocumentNotFoundException ce) {
                        String msg = logException(ce,
-                                       String.format("Could not find %s resource/record to delete with CSID=%s", ctx.getDocumentType(), id));                
+                                       String.format("Could not find %s resource/record to delete with CSID=%s", ctx.getDocumentType(), id));
                        throw new DocumentNotFoundException(msg, ce);
                    }
                    repoSession.save();
@@ -1778,10 +1778,10 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                 releaseRepositorySession(ctx, repoSession);
             }
         }
-        
+
         return result;
     }
-    
+
     /**
      * delete a document from the Nuxeo repository
      *
@@ -1792,12 +1792,12 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     @Override
     public boolean delete(ServiceContext ctx, String id, DocumentHandler handler) throws DocumentNotFoundException,
             DocumentException, TransactionException {
-       boolean result;         
-        
+       boolean result;
+
        List<String> idList = new ArrayList<String>();
        idList.add(id);
        result = delete(ctx, idList, handler);
-       
+
         return result;
     }
 
@@ -2045,7 +2045,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
             logger.error(errMsg);
             throw new Exception(errMsg);
         }
-        
+
         if (repoSession == null) {
             //
             // If we couldn't find a repoSession from the service context (or the context was null) then we need to create a new one using
@@ -2105,14 +2105,14 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
                if (cause != null) {
                        causeMsg = cause.getMessage();
                }
-               
+
             TransactionException te; // a CollectionSpace specific tx exception
             if (causeMsg != null) {
                te = new TransactionException(causeMsg, tre);
             } else {
                te = new TransactionException(tre);
             }
-            
+
             logger.error(te.getMessage(), tre); // Log the standard transaction exception message, plus an exception-specific stack trace
             throw te;
         } catch (Exception e) {
@@ -2139,14 +2139,14 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         }
         return partialTerm;
     }
-    
+
     /**
      * Replaces user-supplied wildcards with SQL wildcards, in a partial term
      * matching search expression.
-     * 
+     *
      * The scope of this replacement excludes the beginning character
      * in that search expression, as that character is treated specially.
-     * 
+     *
      * @param partialTerm
      * @return the partial term, with any user-supplied wildcards replaced
      * by SQL wildcards.
@@ -2199,7 +2199,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
     /**
      * Identifies whether a restriction on tenant ID - to return only records
      * pertaining to the current tenant - is required in a JDBC query.
-     * 
+     *
      * @param tenantBinding a tenant binding configuration.
      * @param ctx a service context.
      * @return true if a restriction on tenant ID is required in the query;
@@ -2227,7 +2227,7 @@ public class NuxeoRepositoryClientImpl implements RepositoryClient<PoxPayloadIn,
         }
         return restrict;
     }
-    
+
     private void rollbackTransaction(CoreSessionInterface repoSession) {
        if (repoSession != null) {
                repoSession.setTransactionRollbackOnly();
index 09958c2e75203a92f50e6b9b3133a36975aa118b..bf26e5d3e0d4f9ade0cb816225335a9c53c4852d 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.concept.client</artifactId>
     <name>services.concept.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.concept.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-concept-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 4db90c8ec91788b6988e70da23e5937900158f70..ec54864e2f1897a449e4d2d7e57a36601d91f3df 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.concept</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.concept.service</artifactId>
     <name>services.concept.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.contact.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -55,7 +55,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -98,7 +92,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-concept</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 2663a200e1d762cb5e48d6e1acba8ed149e519f6..90acd42c8571b29623d0c06d7ef395929a33b6dd 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.conditioncheck.client</artifactId>
     <name>services.conditioncheck.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-conditioncheck-client</finalName>
     </build>
index f4c6b7261f2d74486e78c0a2f248451db19c55a3..99a77ab433670d5d0d6f2e03c1a5bfecf0f25355 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.conditioncheck</artifactId>        
+        <artifactId>org.collectionspace.services.conditioncheck</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.conditioncheck.service</artifactId>
     <name>services.conditioncheck.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,7 +81,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-conditioncheck</finalName>
     </build>
index 6dd0967147b3634f31d9fa03d1aaf670bda90d17..25bc62d0c3c064015eabc48f815d0cb3da80994a 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.conservation.client</artifactId>
     <name>services.conservation.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -54,8 +54,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,7 +77,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-conservation-client</finalName>
     </build>
index 5ba30b48eaba9de23aa8c635d6b5841cb03995af..9d3b41c541ecb6b7122a897951575377a019af4b 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.conservation</artifactId>        
+        <artifactId>org.collectionspace.services.conservation</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.conservation.service</artifactId>
     <name>services.conservation.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-conservation</finalName>
     </build>
 </project>
-
index 4eb45a25a56d73762548865cd82930483a4181d8..4c8975c6cff6bd9a6b32534e08f773eaab25fe2a 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.contact.client</artifactId>
     <name>services.contact.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -32,7 +32,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>${project.version}</version>
-            <!-- 
+            <!--
             <exclusions>
                <exclusion>
                        <artifactId>xml-apis</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -76,9 +69,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-contact-client</finalName>
     </build>
 </project>
-
index 447d043f5012f0fce677ee04d59ea7aa48eed4f1..baad604143bec1db079078c2e49881f7191a00ee 100644 (file)
@@ -5,7 +5,7 @@
         <groupId>org.collectionspace.services</groupId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.contact.service</artifactId>
     <name>services.contact.service</name>
@@ -22,7 +22,7 @@
             <artifactId>org.collectionspace.services.authority.service</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
  -->        <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-        </dependency>        
+        </dependency>
 
       <!-- javax -->
 
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-contact</finalName>
     </build>
 </project>
-
index 269f182817cddafd5f25c82e51c072e727bc0d12..be5981973e685ff391d7b371457344e7493562a0 100644 (file)
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.dimension.client</artifactId>
     <name>services.dimension.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             </dependency>
-        <!-- 
+        <!--
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.IntegrationTests</artifactId>
             <version>${project.version}</version>
         </dependency>
         -->
-        
+
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -76,9 +69,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-dimension-client</finalName>
     </build>
 </project>
-
index 90f7bc3bf446c5b11f89e874a047f86fc549fbe8..b75dff007e05319f4a4ab5ef4e448f232bd235c4 100644 (file)
@@ -6,7 +6,7 @@
         <artifactId>org.collectionspace.services.dimension</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.dimension.service</artifactId>
     <name>services.dimension.service</name>
@@ -43,7 +43,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -73,9 +67,9 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
-        
+
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
@@ -88,9 +82,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-dimension</finalName>
     </build>
 </project>
-
index 471029a66412ff623af5e51c3416247043b48c83..dabd19a79e884a9315160026fca4e75c57e441fb 100644 (file)
@@ -12,7 +12,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.exhibition.client</artifactId>
     <name>services.exhibition.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -31,7 +31,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -58,7 +58,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -88,7 +81,7 @@
             <version>3.1</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-exhibition-client</finalName>
     </build>
index 647c3a77333cefa2dec369cdaca2fb4f9a15198c..fc15e0166713f021bdb22668ac6bcfa7afd643a6 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.exhibition</artifactId>        
+        <artifactId>org.collectionspace.services.exhibition</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.exhibition.service</artifactId>
     <name>services.exhibition.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-exhibition</finalName>
     </build>
 </project>
-
index f9af74b90370ef499e3a9746b0caf7092dbdd03f..a581b2128e64d4636b5239a212f1445aa8d9c230 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.group.client</artifactId>
     <name>services.group.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-group-client</finalName>
     </build>
index 2fcfc886e86f31905c878e227189956e0f6a6d84..60b205149e0db1b9ac50fd3dd9168ea5321d472b 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.group</artifactId>        
+        <artifactId>org.collectionspace.services.group</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.group.service</artifactId>
     <name>services.group.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId> <!-- FIXME: REM - Is this really a required dependency? -->
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-group</finalName>
     </build>
 </project>
-
index e18bf218b17dfb202f1e88cf77a219db5a4c3f39..30f8dc38823a663d4a66bc0e18b9f3fcb84ff6b6 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.imports</artifactId>        
+        <artifactId>org.collectionspace.services.imports</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.imports.service</artifactId>
     <name>services.imports.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -43,7 +43,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId> <!-- FIXME: REM - Is this really a required dependency? -->
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
                <dependency>
-                       <artifactId>servlet-api</artifactId>
-                       <groupId>javax.servlet</groupId>
+                       <groupId>org.apache.tomcat</groupId>
+                       <artifactId>tomcat-servlet-api</artifactId>
+                       <version>${tomcat.version}</version>
                        <scope>provided</scope>
         </dependency>
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -88,7 +83,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- Nuxeo -->
 
         <dependency>
                        <artifactId>nuxeo-importer-xml-parser</artifactId>
                        <version>${nuxeo.platform.version}</version>
                </dependency>
-        
+
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-imports</finalName>
     </build>
 </project>
-
index 422ace30a846d774176d101131684f2ef4dfc2f3..480f2597607dc0eaa78a0535bc505fd8f17134e5 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.index.client</artifactId>
     <name>services.index.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.dimension.client</artifactId> <!-- Dimension instances are used as a unit-tests targets -->
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -74,7 +67,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-index-client</finalName>
     </build>
index 3000997758019f2a2bda357e675aec0127dc0e7c..85d3662265bceead9af7c8ee51c99224cf583aef 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.index</artifactId>        
+        <artifactId>org.collectionspace.services.index</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.index.service</artifactId>
     <name>services.index.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -32,7 +32,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -62,7 +56,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -76,9 +70,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-index</finalName>
     </build>
 </project>
-
index dae02569c723b84afff7c99109394e5dff77902b..f836d96bbbcbb8f8c5cf319be00d77a3adcb5d89 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.intake.client</artifactId>
     <name>services.intake.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>org.collectionspace.services.organization.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -90,9 +83,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-intake-client</finalName>
     </build>
 </project>
-
index 91ca648c6ee983c7f523c038a9ede01ae67c87ac..c2e63fd2073493c86c6130710d7c906b9e8dd155 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.intake</artifactId>        
+        <artifactId>org.collectionspace.services.intake</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.intake.service</artifactId>
     <name>services.intake.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.intake.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -47,7 +47,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -77,7 +71,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -92,9 +86,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-intake</finalName>
     </build>
 </project>
-
index 9fd533afcaacf41fb6dc748ae6168c3f4a789898..773289dc3fb0bc2cc8415bc40a671d7aff03120b 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.loanin.client</artifactId>
     <name>services.loanin.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -54,8 +54,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,7 +77,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-loanin-client</finalName>
     </build>
index 9ccfe2633a9d7607f8267853472e60859d2903a2..33d54c5a96e217747dafb34535966554e3e17e9c 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.loanin</artifactId>        
+        <artifactId>org.collectionspace.services.loanin</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.loanin.service</artifactId>
     <name>services.loanin.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -43,7 +43,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -73,7 +67,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -88,9 +82,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-loanin</finalName>
     </build>
 </project>
-
index 077fb04ae3afe2eca15141a351f6755002899294..18a9bf6e6f1eec4e5a6667a83ab22c70eafc74b1 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.loanout.client</artifactId>
     <name>services.loanout.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-loanout-client</finalName>
     </build>
index 0f5dcd3723774b305124581a3b39ec93ef9f4fb3..4c1ddf43f30cb91e2fc0d7dabe3e3eabb1a4b6b2 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.loanout</artifactId>        
+        <artifactId>org.collectionspace.services.loanout</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.loanout.service</artifactId>
     <name>services.loanout.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
                <groupId>org.collectionspace.services</groupId>
                <artifactId>org.collectionspace.services.loanout.client</artifactId>
                <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -86,9 +80,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-loanout</finalName>
     </build>
 </project>
-
index 5d360de40b249ba8ce25b9d96ac397dac282c806..cb2c22df3d0e5d3c32204b48d65d420110fada8c 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.location.client</artifactId>
     <name>services.location.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.location.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-location-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index cc33b3a90f06ae1382dbab789b317b639d500787..0e5eff591426261a721500991d88d55d01ba830b 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.location</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.location.service</artifactId>
     <name>services.location.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.contact.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -55,7 +55,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -98,7 +92,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-location</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 746de6a190774dcb790c96167d8b6fda9890ce9c..d9135c699e06a0ec3b00fdbba53c0634ffb2921e 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.material.client</artifactId>
     <name>services.material.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.material.jaxb</artifactId>
@@ -48,7 +48,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>   
+        </dependency>
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-material-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 8b3a781774bc376e902dab2e937cc3a3388359be..d9afc459fc2ba6f2b3c7d8af3042910801df280b 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.material</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.material.service</artifactId>
     <name>services.material.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -41,7 +41,7 @@
             <optional>true</optional>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -51,7 +51,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -94,7 +88,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-material</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 3ff9b7bfccf0c4b6b5dab3108abd326589d52db4..a24ffbee9df4101f46154c69e147ef0218a7623c 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.media.client</artifactId>
     <name>services.media.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -61,7 +61,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -90,7 +83,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-media-client</finalName>
     </build>
index fd7dbfdbc35bf4715614c1025a2f24b263fa41df..28f5c2700b76c00887a997fa813d50e1b4d7d2d3 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.media</artifactId>        
+        <artifactId>org.collectionspace.services.media</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.media.service</artifactId>
     <name>services.media.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -42,7 +42,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>${tomcat.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>javax.security</groupId>
             <artifactId>jaas</artifactId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -82,7 +83,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -96,9 +97,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-media</finalName>
     </build>
 </project>
-
index 5cea50cfcbd270fa69f0a5c9c9dbca67b35c4773..c8c286e199dd8890e5aa6247b93954cf8e3bafb1 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.movement.client</artifactId>
     <name>services.movement.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -57,7 +57,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -86,7 +79,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-movement-client</finalName>
     </build>
index a6e2556d1b76ebc6669c8f11d526908c923f823f..5f5342bbdf44af4d77fad26ed901672fdcd4667b 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.movement</artifactId>        
+        <artifactId>org.collectionspace.services.movement</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.movement.service</artifactId>
     <name>services.movement.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -76,7 +70,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -90,9 +84,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-movement</finalName>
     </build>
 </project>
-
index 113bbf41e9f63ce8ce25ca4fdb700180cb6e4cdf..9835c1d7097ca47748a333ac1c618b7dae57029a 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.note.client</artifactId>
     <name>services.note.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -41,7 +41,7 @@
         </dependency>
 
         <!-- External dependencies -->
-        
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -71,9 +64,8 @@
             <version>3.1</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-note-client</finalName>
     </build>
 </project>
-
index 806c4c8b5ed0fc11845595f7af5a82a4ba67dbfc..d5b9ed7cc7b87ec03481b18cc84f4bebf1642b8b 100644 (file)
@@ -5,7 +5,7 @@
         <groupId>org.collectionspace.services</groupId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.note.service</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-        </dependency>        
+        </dependency>
 
       <!-- javax -->
 
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -63,7 +57,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -78,9 +72,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-note</finalName>
     </build>
 </project>
-
index a18015b49b5c6b7a5f5ef2af8fdcbeaa517b7266..764cce731cbcbc9bebbb750451efe50bafe861fd 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.objectexit.client</artifactId>
     <name>services.objectexit.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-objectexit-client</finalName>
     </build>
index 54bd376c0af1b53166265169dffa628afac2d09d..f888aefa97e7d246005369c79f151f34e4391476 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.objectexit</artifactId>        
+        <artifactId>org.collectionspace.services.objectexit</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.objectexit.service</artifactId>
     <name>services.objectexit.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId> <!-- FIXME: REM - Is this really a required dependency? -->
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-objectexit</finalName>
     </build>
 </project>
-
index 23e3ac6341ff1281401bee638737b945ee091e2d..f36676b0a842a5661ab6e832e635f9b3e70d1a69 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.organization.client</artifactId>
     <name>services.organization.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -34,7 +34,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.contact.client</artifactId>            
+            <artifactId>org.collectionspace.services.contact.client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -79,9 +72,8 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-organization-client</finalName>
     </build>
 </project>
-
index 60a899ff2ba263a3262418590e8ae078c08f39f2..7070cba147364cfafda6a90b6281d89af7ea73fa 100644 (file)
@@ -5,7 +5,7 @@
         <artifactId>org.collectionspace.services.organization</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.organization.service</artifactId>
     <name>services.organization.service</name>
@@ -26,7 +26,7 @@
             <artifactId>org.collectionspace.services.authority.service</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -46,7 +46,7 @@
             <artifactId>org.collectionspace.services.contact.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -56,7 +56,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -99,7 +93,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-organization</finalName>
     </build>
 </project>
-
index 7650a40288f9a8e7073fe32f4c13f1db18225440..cd2d771a8687aff3b85eb081cc1c40eeaa93aa5b 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.person.client</artifactId>
     <name>services.person.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -32,7 +32,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>                
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-person-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 263f95bf4713525de7e9fd9b39e4f920fe01bd31..b3a5e84f19eb5ad79393260afd5a187beedbfcda 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.person</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.person.service</artifactId>
     <name>services.person.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.contact.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -55,7 +55,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-person</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 91be244052f3bdda70314b07331f1111b57b15c6..c1904d3b9c57e56447a26812aa7ffe05411f4819 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.place.client</artifactId>
     <name>services.place.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.place.jaxb</artifactId>
@@ -48,7 +48,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>   
+        </dependency>
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-place-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 4cb0b70a79c77ca399b4251ea4ca4c2d1c2376b3..4f3c6113d46cf29b13a12a832cae05c579f5f778 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.place</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.place.service</artifactId>
     <name>services.place.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -41,7 +41,7 @@
             <optional>true</optional>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -51,7 +51,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
@@ -64,7 +64,7 @@
             <artifactId>commons-logging</artifactId>
             <version>1.1</version>
         </dependency>
-               
+
                <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -94,7 +88,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-place</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index a81fe9592e59de0f4fd9d3998947c07c913452ec..a6ede44a5494a52e36df7725400b558a4b7d58da 100644 (file)
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services</artifactId>
-        <version>5.2-SNAPSHOT</version>
-    </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <parent>
+               <groupId>org.collectionspace.services</groupId>
+               <artifactId>org.collectionspace.services</artifactId>
+               <version>5.2-SNAPSHOT</version>
+       </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.collectionspace.services.main</artifactId>
-    <name>services.main</name>
-    <packaging>pom</packaging>
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>org.collectionspace.services.main</artifactId>
+       <name>services.main</name>
+       <packaging>pom</packaging>
 
        <properties>
                <annox.version>0.5.0</annox.version>
                <resteasy.version>3.0.19.Final</resteasy.version>
                <mysql.driver.version>5.1.8</mysql.driver.version>
                <postgres.driver.version>42.2.1</postgres.driver.version>
+               <tomcat.version>8.5.40</tomcat.version>
                <!-- The default life cycle policy for Nuxeo document types -->
                <Lifecycle>cs_default</Lifecycle>
        </properties>
 
-    <!--
+       <!--
     !!!!!PLEASE READ!!!!!
     Make sure you add modules below in the order of dependency. Security and
     infrastructure modules should be built first. For example the authorization-mgt
     module would also import default permissions. Domain specific services should only
     be built after the security module and common modules are built
     -->
-    <modules>
-        <module>config</module>
-        <module>common-api</module>
-        <module>authentication</module>
+       <modules>
+               <module>config</module>
+               <module>common-api</module>
+               <module>authentication</module>
                <module>authorization-common</module>
-        <module>authorization</module>
-        <module>blob</module>
-        <module>client</module>
-        <module>jaxb</module>
-        <module>hyperjaxb</module>
-        <module>common</module>
-        <module>structureddate</module>
-        <module>systeminfo</module>
-        <module>authority</module>
-        <module>authorization-mgt</module> <!-- relies on authorization -->
-        <module>common-test</module>
-        <module>account</module> <!-- relies on authorization-mgt.import -->
-        <!-- 
+               <module>authorization</module>
+               <module>blob</module>
+               <module>client</module>
+               <module>jaxb</module>
+               <module>hyperjaxb</module>
+               <module>common</module>
+               <module>structureddate</module>
+               <module>systeminfo</module>
+               <module>authority</module>
+               <module>authorization-mgt</module>              <!-- relies on authorization -->
+               <module>common-test</module>
+               <module>account</module>                <!-- relies on authorization-mgt.import -->
+               <!--
         <module>note</module>
          -->
-        <module>relation</module>
-        <module>query</module>
-        <module>acquisition</module>
-        <module>vocabulary</module>
-        <module>organization</module>
-        <module>person</module>
-        <module>citation</module>
-        <module>id</module>
-        <module>collectionobject</module>
-        <module>servicegroup</module>
-        <module>group</module>
-        <module>intake</module>
-        <module>loanin</module>
-        <module>loanout</module>
-        <module>claim</module>
-        <module>exhibition</module>
-        <module>conditioncheck</module>
-        <module>conservation</module>
-        <module>valuationcontrol</module>
-        <module>objectexit</module>
-        <module>propagation</module>
-        <module>pottag</module>
-        <module>batch</module>
-        <module>imports</module>
-        <module>location</module>
-        <module>place</module>
-        <module>work</module>
-        <module>material</module>
-        <module>concept</module>
-        <module>taxonomy</module>
-        <module>movement</module>
-        <module>report</module>
-        <module>dimension</module>
-        <module>contact</module>
-        <module>workflow</module>
-        <module>index</module>
-        <module>media</module>
-        <module>uoc</module>
-        <module>publicitem</module>        
-        <module>IntegrationTests</module>
-        <module>PerformanceTests</module>
-        <module>security</module>
-        <module>JaxRsServiceProvider</module>
-    </modules>
+               <module>relation</module>
+               <module>query</module>
+               <module>acquisition</module>
+               <module>vocabulary</module>
+               <module>organization</module>
+               <module>person</module>
+               <module>citation</module>
+               <module>id</module>
+               <module>collectionobject</module>
+               <module>servicegroup</module>
+               <module>group</module>
+               <module>intake</module>
+               <module>loanin</module>
+               <module>loanout</module>
+               <module>claim</module>
+               <module>exhibition</module>
+               <module>conditioncheck</module>
+               <module>conservation</module>
+               <module>valuationcontrol</module>
+               <module>objectexit</module>
+               <module>propagation</module>
+               <module>pottag</module>
+               <module>batch</module>
+               <module>imports</module>
+               <module>location</module>
+               <module>place</module>
+               <module>work</module>
+               <module>material</module>
+               <module>concept</module>
+               <module>taxonomy</module>
+               <module>movement</module>
+               <module>report</module>
+               <module>dimension</module>
+               <module>contact</module>
+               <module>workflow</module>
+               <module>index</module>
+               <module>media</module>
+               <module>uoc</module>
+               <module>publicitem</module>
+               <module>IntegrationTests</module>
+               <module>PerformanceTests</module>
+               <module>security</module>
+               <module>JaxRsServiceProvider</module>
+       </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>org.testng</groupId>
+                       <artifactId>testng</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
 
-    <repositories> </repositories>
+       <repositories></repositories>
 
-    <pluginRepositories>
-    </pluginRepositories>
+       <pluginRepositories>
+       </pluginRepositories>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M1</version>
-                    <configuration>
-                        <systemProperties>
-                            <property>
-                                <name>log4j.configuration</name>
-                                <value>file:${project.build.directory}/test-classes/log4j.properties</value>
-                            </property>
-                            <property>
-                                <name>maven.basedir</name>
-                                <value>${basedir}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>
-          <version>1.0-alpha-2</version>
-        </plugin>
+       <build>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-surefire-plugin</artifactId>
+                                       <version>3.0.0-M1</version>
+                                       <configuration>
+                                               <systemProperties>
+                                                       <property>
+                                                               <name>log4j.configuration</name>
+                                                               <value>file:${project.build.directory}/test-classes/log4j.properties</value>
+                                                       </property>
+                                                       <property>
+                                                               <name>maven.basedir</name>
+                                                               <value>${basedir}</value>
+                                                       </property>
+                                               </systemProperties>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>properties-maven-plugin</artifactId>
+                                       <version>1.0-alpha-2</version>
+                               </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-site-plugin</artifactId>
                                        <version>3.3</version>
-                               </plugin>                               
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jboss-maven-plugin</artifactId>
-                    <version>1.4</version>
-                    <configuration>
-                        <jbossHome>${jboss.dir}</jbossHome>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.jvnet.hyperjaxb3</groupId>
-                    <artifactId>maven-hyperjaxb3-plugin</artifactId>
-                    <version>0.6.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                       <bindingIncludes>
-                                       <include>bindings.xjb</include>
-                               </bindingIncludes>
-                        <args>
-                            <arg>-Xannotate</arg> 
-                        </args>
-                        <extension>true</extension>
-                        <jdk5>true</jdk5>
-                        <ejb3>false</ejb3>
-                        <persistenceUnitName>garbage</persistenceUnitName>
-                    </configuration>
-                </plugin>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>jboss-maven-plugin</artifactId>
+                                       <version>1.4</version>
+                                       <configuration>
+                                               <jbossHome>${jboss.dir}</jbossHome>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.jvnet.hyperjaxb3</groupId>
+                                       <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                                       <version>0.6.0</version>
+                                       <executions>
+                                               <execution>
+                                                       <goals>
+                                                               <goal>generate</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                                       <configuration>
+                                               <bindingIncludes>
+                                                       <include>bindings.xjb</include>
+                                               </bindingIncludes>
+                                               <args>
+                                                       <arg>-Xannotate</arg>
+                                               </args>
+                                               <extension>true</extension>
+                                               <jdk5>true</jdk5>
+                                               <ejb3>false</ejb3>
+                                               <persistenceUnitName>garbage</persistenceUnitName>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <groupId>org.jvnet.jaxb2.maven2</groupId>
                                        <artifactId>maven-jaxb2-plugin</artifactId>
                                                                </schemaIncludes>
                                                                <bindingDirectory>src/main/resources</bindingDirectory>
                                                                <bindingIncludes>
-                                                       <include>bindings.xml</include>
-                                               </bindingIncludes>
+                                                                       <include>bindings.xml</include>
+                                                               </bindingIncludes>
                                                                <args>
                                                                        <arg>-extension</arg>
                                                                        <arg>-Xnamespace-prefix</arg>
-                                                                       <arg>-Xannotate</arg> 
-                                                                       <arg>-verbose</arg> 
+                                                                       <arg>-Xannotate</arg>
+                                                                       <arg>-verbose</arg>
                                                                        <!-- <arg>-XtoString</arg> -->
                                                                        <arg>-Xequals</arg>
                                                                        <arg>-XhashCode</arg>
                                                                        <!-- <arg>-Xcopyable</arg> -->
                                                                </args>
                                                                <plugins>
-                                                                       <plugin> 
-                                                                         <groupId>javax.xml.bind</groupId>
-                                                                         <artifactId>jaxb-api</artifactId>
-                                                                         <version>${jaxb.version}</version>
-                                    </plugin> 
-                                                                       <plugin> 
-                                           <groupId>org.jvnet.jaxb2_commons</groupId> 
-                                           <artifactId>jaxb2-basics-annotate</artifactId> 
+                                                                       <plugin>
+                                                                               <groupId>javax.xml.bind</groupId>
+                                                                               <artifactId>jaxb-api</artifactId>
+                                                                               <version>${jaxb.version}</version>
+                                                                       </plugin>
+                                                                       <plugin>
+                                                                               <groupId>org.jvnet.jaxb2_commons</groupId>
+                                                                               <artifactId>jaxb2-basics-annotate</artifactId>
                                                                                <version>${jaxb2-basics.version}</version>
-                                    </plugin> 
+                                                                       </plugin>
                                                                        <plugin>
                                                                                <groupId>org.jvnet.jaxb2_commons</groupId>
                                                                                <artifactId>jaxb2-basics</artifactId>
                                        <dependencies>
                                                <dependency>
                                                        <groupId>org.jvnet.jaxb2_commons</groupId>
-                                                       <artifactId>jaxb2-namespace-prefix</artifactId> <!-- Used to force a specific namespace prefix specified in src/main/resource/bindings.xml -->
+                                                       <artifactId>jaxb2-namespace-prefix</artifactId>                                                 <!-- Used to force a specific namespace prefix specified in src/main/resource/bindings.xml -->
                                                        <version>1.4-SNAPSHOT</version>
                                                </dependency>
                                        </dependencies>
                                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.1</version>
-                    <configuration>
-                        <systemProperties>
-                            <systemProperty>
-                                <key>log4j.configuration</key>
-                                <value>file:${project.build.directory}/classes/log4j.properties</value>
-                            </systemProperty>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>exec-maven-plugin</artifactId>
+                                       <version>1.1</version>
+                                       <configuration>
+                                               <systemProperties>
+                                                       <systemProperty>
+                                                               <key>log4j.configuration</key>
+                                                               <value>file:${project.build.directory}/classes/log4j.properties</value>
+                                                       </systemProperty>
+                                               </systemProperties>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>                         
-            </plugin>
-        </plugins>
-    </build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <configuration>
+                                       <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <!--show>public</show-->
-                </configuration>
-            </plugin>
-            <!--plugin>
+       <reporting>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <!--show>public</show-->
+                               </configuration>
+                       </plugin>
+                       <!--plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>taglist-maven-plugin</artifactId>
                 <version>2.1</version>
                      <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
                 </configuration>
             </plugin-->
-            <!--<plugin>
+                       <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>3.0.1</version>
                 </configuration>
             </plugin>-->
 
-        </plugins>
-    </reporting>
-    
-    <dependencyManagement>
-        <dependencies>
+               </plugins>
+       </reporting>
+
+       <dependencyManagement>
+               <dependencies>
                        <dependency>
                                <groupId>org.collectionspace.services</groupId>
                                <artifactId>org.collectionspace.services.common</artifactId>
                                <version>${project.version}</version>
                                <exclusions>
                                        <exclusion>
-                                               <artifactId>jersey-server</artifactId>
                                                <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-server</artifactId>
                                        </exclusion>
                                        <exclusion>
-                                               <artifactId>jersey-servlet</artifactId>
                                                <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-servlet</artifactId>
                                        </exclusion>
                                        <exclusion>
-                                               <artifactId>jersey-core</artifactId>
                                                <groupId>com.sun.jersey</groupId>
+                                               <artifactId>jersey-core</artifactId>
                                        </exclusion>
                                </exclusions>
                        </dependency>
                                <artifactId>ehcache</artifactId>
                                <version>2.10.2</version>
                        </dependency>
-                        <dependency>
-                               <artifactId>servlet-api</artifactId>
-                               <groupId>javax.servlet</groupId>
-                               <version>2.5</version>
+                       <dependency>
+                               <groupId>org.apache.tomcat</groupId>
+                               <artifactId>tomcat-servlet-api</artifactId>
+                               <version>${tomcat.version}</version>
+                               <scope>provided</scope>
                        </dependency>
 
-                       <!-- Start of Nuxeo dependencies -->
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>net.java.dev.jaxb2-commons</groupId>
+                               <artifactId>jaxb-fluent-api</artifactId>
+                               <version>2.0.2</version>
                        </dependency>
-               <dependency>
-                   <groupId>org.nuxeo.ecm.core</groupId>
-                   <artifactId>nuxeo-core-api</artifactId>
-                   <version>${nuxeo.core.version}</version>
-            </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.common</groupId>
-                               <artifactId>nuxeo-common</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jvnet.jaxb2_commons</groupId>
+                               <artifactId>jaxb2-basics</artifactId>
+                               <version>${jaxb2-basics.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.runtime</groupId>
-                               <artifactId>nuxeo-runtime</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jvnet.jaxb2-commons</groupId>
+                               <artifactId>property-listener-injector</artifactId>
+                               <version>1.0</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core-schema</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jvnet.jaxb2_commons</groupId>
+                               <artifactId>jaxb2-basics-runtime</artifactId>
+                               <version>${jaxb2-basics.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core-storage-sql</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-jaxrs</artifactId>
+                               <version>${resteasy.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>tjws</groupId>
+                                               <artifactId>webserver</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.httpcomponents</groupId>
+                                               <artifactId>httpclient</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core-storage-sql-ra</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-jaxb-provider</artifactId>
+                               <version>${resteasy.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core-io</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>org.jboss.resteasy</groupId>
+                               <artifactId>resteasy-multipart-provider</artifactId>
+                               <version>${resteasy.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-core-convert</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>commons-httpclient</groupId>
+                               <artifactId>commons-httpclient</artifactId>
+                               <version>3.1</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-opencmis-impl</artifactId>
-                               <version>${nuxeo.core.version}</version>
-                       </dependency>                   
+                               <groupId>commons-io</groupId>
+                               <artifactId>commons-io</artifactId>
+                               <version>2.5</version>
+                       </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.ecm.core</groupId>
-                               <artifactId>nuxeo-opencmis-bindings</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>commons-cli</groupId>
+                               <artifactId>commons-cli</artifactId>
+                               <version>1.2</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.runtime</groupId>
-                               <artifactId>nuxeo-runtime-jtajca</artifactId>
-                               <version>${nuxeo.core.version}</version>  
+                               <groupId>com.sun.xml.bind</groupId>
+                               <artifactId>jaxb-core</artifactId>
+                               <version>${jaxb.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.nuxeo.runtime</groupId>
-                               <artifactId>nuxeo-runtime-datasource</artifactId>
-                               <version>${nuxeo.core.version}</version>
+                               <groupId>com.sun.xml.bind</groupId>
+                               <artifactId>jaxb-impl</artifactId>
+                               <version>${jaxb.version}</version>
                        </dependency>
-                       <!-- End of Nuxeo dependencies -->
-
-            <dependency>
-                <groupId>net.java.dev.jaxb2-commons</groupId>
-                <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.2</version>
-            </dependency>
                        <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics</artifactId>
-                               <version>${jaxb2-basics.version}</version>
+                               <groupId>javax.persistence</groupId>
+                               <artifactId>persistence-api</artifactId>
+                               <version>1.0</version>
                        </dependency>
-            <dependency>
-                <groupId>org.jvnet.jaxb2-commons</groupId>
-                <artifactId>property-listener-injector</artifactId>
-                <version>1.0</version>
-            </dependency>
                        <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics-runtime</artifactId>
-                               <version>${jaxb2-basics.version}</version>
+                               <groupId>org.hibernate</groupId>
+                               <artifactId>hibernate-entitymanager</artifactId>
+                               <version>3.4.0.GA</version>
                        </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-jaxrs</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-jaxb-provider</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-multipart-provider</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.2</version>
-            </dependency>
                        <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
-                               <artifactId>jaxb-core</artifactId>
-                               <version>${jaxb.version}</version>
+                               <groupId>org.hibernate</groupId>
+                               <artifactId>hibernate-c3p0</artifactId>
+                               <version>3.6.10.Final</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
-                               <artifactId>jaxb-impl</artifactId>
-                               <version>${jaxb.version}</version>
+                               <groupId>org.jvnet.hyperjaxb3</groupId>
+                               <!-- for time type adapters -->
+                               <artifactId>hyperjaxb3-ejb-runtime</artifactId>
+                               <version>0.6.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>mysql</groupId>
+                               <artifactId>mysql-connector-java</artifactId>
+                               <version>${mysql.driver.version}</version>
                        </dependency>
-            <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>persistence-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-entitymanager</artifactId>
-                <version>3.4.0.GA</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-c3p0</artifactId>
-                <version>3.6.10.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <!-- for time type adapters -->
-                <artifactId>hyperjaxb3-ejb-runtime</artifactId>
-                <version>0.6.0</version>
-            </dependency>
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql.driver.version}</version>
-            </dependency>
                        <dependency>
                                <groupId>org.postgresql</groupId>
                                <artifactId>postgresql</artifactId>
                                <version>${postgres.driver.version}</version>
                        </dependency>
                        <dependency>
-                   <groupId>dom4j</groupId>
-                   <artifactId>dom4j</artifactId>
-                   <version>1.6.1</version>
-                   <scope>compile</scope>
-                   <exclusions>
-                       <exclusion>
-                               <artifactId>xml-apis</artifactId>
-                               <groupId>xml-apis</groupId>
-                       </exclusion>
-                   </exclusions>
-               </dependency>
-        </dependencies>
-    </dependencyManagement>
+                               <groupId>dom4j</groupId>
+                               <artifactId>dom4j</artifactId>
+                               <version>1.6.1</version>
+                               <scope>compile</scope>
+                               <exclusions>
+                                       <exclusion>
+                                               <artifactId>xml-apis</artifactId>
+                                               <groupId>xml-apis</groupId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 </project>
index 032c7295b7e5bc9e8ef511565cee3d650eaab41e..756b91da23051b93ba2287bfc95f9535512dcf67 100644 (file)
@@ -12,7 +12,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.pottag.client</artifactId>
     <name>services.pottag.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -56,8 +56,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -87,7 +80,7 @@
             <version>3.1</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-pottag-client</finalName>
     </build>
index 57e58208ba16fb0027b9721e4a2969df665ec10d..a7f5e9c9c45d6f46eb7d523aad82ec787ce55a15 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.pottag</artifactId>        
+        <artifactId>org.collectionspace.services.pottag</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.pottag.service</artifactId>
     <name>services.pottag.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <artifactId>dom4j</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -78,7 +72,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -93,9 +87,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-pottag</finalName>
     </build>
 </project>
-
index 79e1a65aca97817987ceadd5f94afb718e45d56b..da90f726fa134937cde932cd4fb32be364fa6c78 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.propagation.client</artifactId>
     <name>services.propagation.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -54,8 +54,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <version>3.1</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-propagation-client</finalName>
     </build>
index dc257326ac3715fc4ba2a3e7b59dbdfa829a4c6c..583b2f335ae3e7428765b5669b7d182570bc3848 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.propagation</artifactId>        
+        <artifactId>org.collectionspace.services.propagation</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.propagation.service</artifactId>
     <name>services.propagation.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -47,7 +47,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <artifactId>dom4j</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -83,7 +77,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -98,9 +92,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-propagation</finalName>
     </build>
 </project>
-
index 296e43007fe438a3e91884d12d5a6aa423f798f8..da8d10bf278724cfbbaa3188d0f74462301df26f 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.publicitem.client</artifactId>
     <name>services.publicitem.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -49,8 +49,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -79,7 +72,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-publicitem-client</finalName>
     </build>
index 6eef9ac57b79e3638e2cacb80984dbc4cc1f1100..9f8aa727674b3606ec56f397db0b610fb00440ae 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.publicitem</artifactId>        
+        <artifactId>org.collectionspace.services.publicitem</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.publicitem.service</artifactId>
     <name>services.publicitem.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-publicitem</finalName>
     </build>
 </project>
-
index 812071e75d427f72077cfbfe4af0d19ae5e6ac05..c007b841be389440c119b79f6557ab54dfbbf60f 100644 (file)
@@ -7,7 +7,7 @@
         <artifactId>org.collectionspace.services.query</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.query.service</artifactId>
     <name>services.query.service</name>
@@ -29,7 +29,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1</version>
         </dependency>
-        
+
         <!-- RESTEasy -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -64,9 +58,8 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-query</finalName>
     </build>
 </project>
-
index 009724fc329281a802c45db33c0f28136a2d6427..944df646cd9f3ee6a4ed7444ff3dc2e4f58d5873 100644 (file)
@@ -29,7 +29,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
index ca30b6a84dd2c00ef9ebc61f6e82fc4f90582e7a..5f92e95eb88de4ba963ece876e74f158c3291069 100644 (file)
@@ -5,7 +5,7 @@
         <artifactId>org.collectionspace.services.relation</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.relation.service</artifactId>
     <name>services.relation.service</name>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.citation.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
-        
+        </dependency>
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.organization.client</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-relation</finalName>
     </build>
index b21ea54ade4dfdf00b9ef53ef721355b8ad90197..19af1f2d199560d66d86dae40f63e38aff593b9f 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.report.client</artifactId>
     <name>services.report.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-            </dependency>        
+            </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.report.jaxb</artifactId>
@@ -65,7 +65,7 @@
             <artifactId>org.collectionspace.services.organization.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -94,9 +87,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-report-client</finalName>
     </build>
 </project>
-
index fdc102da87c01d390ee019b0f51a6077009681d4..4c2f26ec0ce05473c5e46d90215741f6c69cdf07 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.report</artifactId>        
+        <artifactId>org.collectionspace.services.report</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.report.service</artifactId>
     <name>services.report.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -23,7 +23,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -43,7 +43,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -53,7 +53,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
                <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -83,7 +77,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -98,9 +92,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-report</finalName>
     </build>
 </project>
-
index 705d81e05ff8954fd1e00542e96e445f775df129..366b60282f38dffc03d488d715c798d3bbb81b31 100644 (file)
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -90,7 +83,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
         </plugins>
     </build>
 </project>
-
index a32d5541ce787bf5b72953239acf4cdf1f104c32..498f88d7802f3ecf770b718c29452977fa4c93ae 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.servicegroup.client</artifactId>
     <name>services.servicegroup.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.servicegroup.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -74,7 +67,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-servicegroup-client</finalName>
     </build>
index 2f642f8144195e72ad2fa3a074c6e521ed5c9e0d..ccb27a66dd204062fc7f46ddcdae9d0d66eee365 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.servicegroup</artifactId>        
+        <artifactId>org.collectionspace.services.servicegroup</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.servicegroup.service</artifactId>
     <name>services.servicegroup.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -37,7 +37,7 @@
             <artifactId>org.collectionspace.services.servicegroup.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -47,7 +47,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -77,7 +71,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -92,9 +86,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-servicegroup</finalName>
     </build>
 </project>
-
index 5c86ebc9a7e3339e8f93d064ce3419afdce460a3..0f8ef78ca63f705cb6e4c02f4584c0cb90039b2e 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.structureddate.client</artifactId>
     <name>services.structureddate.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     <!-- CollectionSpace dependencies -->
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
@@ -44,7 +44,7 @@
         </dependency>
 
         <!-- External dependencies -->
-        
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -70,9 +63,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-structureddate-client</finalName>
     </build>
 </project>
-
index 40a2439fecbf9b4170916870a71cd9c87592c8a7..7c75305691df7132f41f92b84c3958afbe6fed5b 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.structureddate</artifactId>        
+        <artifactId>org.collectionspace.services.structureddate</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.structureddate.service</artifactId>
     <name>services.structureddate.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -26,7 +26,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.structureddate.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.structureddate.structureddate</artifactId>
@@ -44,7 +44,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-structureddate-service</finalName>
     </build>
 </project>
-
index 4edf9847e13df5b16477bea876fb63d369fbe268..7c5d8f3cdd8ee2fe481782861c7ccd47b2b07a40 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.systeminfo.client</artifactId>
     <name>services.systeminfo.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
     <!-- CollectionSpace dependencies -->
-        
+
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
@@ -39,7 +39,7 @@
         </dependency>
 
         <!-- External dependencies -->
-        
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -65,9 +58,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-systeminfo-client</finalName>
     </build>
 </project>
-
index 0f54e56531492b7e6ae340d522fadfadc20d8e29..10df71688752403c2e9d0f0c4146608ff6af5051 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.systeminfo</artifactId>        
+        <artifactId>org.collectionspace.services.systeminfo</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.systeminfo.service</artifactId>
     <name>services.systeminfo.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -26,7 +26,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.systeminfo.client</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
 
         <!-- External dependencies -->
 
@@ -39,7 +39,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-systeminfo-service</finalName>
     </build>
 </project>
-
index d37cc2ca11b9f59bec7322ce1e2ccb8e74de2ced..d417a7e9db267c8b569d381595b18fba4902931c 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.taxonomy.client</artifactId>
     <name>services.taxonomy.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.taxonomy.jaxb</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-taxonomy-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index 8620f5fe1242e073662ee8d5fe509a7a72de03ed..8111090cc9e3ef2d2998c7bf5a7a807f5234fb50 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.taxonomy</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.taxonomy.service</artifactId>
     <name>services.taxonomy.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-        <!-- CollectionSpace dependencies -->        
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -40,7 +40,7 @@
             <artifactId>org.collectionspace.services.authority.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -50,7 +50,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -93,7 +87,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-taxonomy</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index a5a6a7d1a817381b2363de4060e2740572b6b55b..63794d4059327ac9db1503a49516b4539c32202a 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.uoc.client</artifactId>
     <name>services.uoc.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -54,8 +54,8 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>    
-<!-- External dependencies -->        
+        </dependency>
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,7 +77,7 @@
             <artifactId>commons-httpclient</artifactId>
             </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-uoc-client</finalName>
     </build>
index 60a7a020093549c523a978cc6162b6e282f94166..97422d6cfbb88c753fb5783c65365e3a95d807c3 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.uoc</artifactId>        
+        <artifactId>org.collectionspace.services.uoc</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.uoc.service</artifactId>
     <name>services.uoc.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -43,7 +43,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -73,7 +67,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -88,9 +82,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-uoc</finalName>
     </build>
 </project>
-
index 12a8069bf232d9499468afc6c72ef6dde984e1d2..4acbc767d09d82459103bcb81511a53e3882ea1c 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.valuationcontrol.client</artifactId>
     <name>services.valuationcontrol.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,7 +30,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
@@ -56,7 +56,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -85,7 +78,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-valuationcontrol-client</finalName>
     </build>
index 882563fa9ba3c40de683d8cd32deb81d135c2a9c..224373a1d8bed65199e4ddf133a06427b1ea639f 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.valuationcontrol</artifactId>        
+        <artifactId>org.collectionspace.services.valuationcontrol</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.valuationcontrol.service</artifactId>
     <name>services.valuationcontrol.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -32,7 +32,7 @@
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +42,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -72,7 +66,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -87,9 +81,8 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-valuationcontrol</finalName>
     </build>
 </project>
-
index f0e3876c9f45b90eabc9a0a844e8814bcc12b90f..dfad2b37cf6af41643f7b4cf9de9a4e8585f0879 100644 (file)
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.vocabulary.client</artifactId>
     <name>services.vocabulary.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -74,9 +67,8 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-vocabulary-client</finalName>
     </build>
 </project>
-
index 083d0ae3adcefb348def5d35dde58b011bc2bb83..8df24fcfe90122b3ec60d4d2a0191e354769e199 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.vocabulary</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.vocabulary.service</artifactId>
     <name>services.vocabulary.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -45,7 +45,7 @@
                    <artifactId>org.collectionspace.services.vocabulary.client</artifactId>
                <version>${project.version}</version>
         </dependency>
-        
+
         <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -56,7 +56,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -99,7 +93,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-vocabulary</finalName>
     </build>
 </project>
-
index 6e329bc0efa9b431bdad037846a079f6b3fbe0f6..a76b10f90e3facf9fa1490f4f4d98c853a8a1480 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.work.client</artifactId>
     <name>services.work.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.work.jaxb</artifactId>
@@ -48,7 +48,7 @@
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>   
+        </dependency>
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-work-client</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index e47cd453c51b9376ba52f64de7d0ff00464d335c..e8332cbd12fcd4ab257cdebc1065614938935194 100644 (file)
@@ -5,12 +5,12 @@
         <artifactId>org.collectionspace.services.work</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.work.service</artifactId>
     <name>services.work.service</name>
     <packaging>jar</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -20,7 +20,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -41,7 +41,7 @@
             <optional>true</optional>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -51,7 +51,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
         <!-- apache -->
         <dependency>
             <groupId>commons-beanutils</groupId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -94,7 +88,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-work</finalName>
         <plugins>
         </plugins>
     </build>
 </project>
-
index bf9e1454183ccd4711834281d035c676b7db0f98..8a587485bde9643142c07c91ffec9ce1d637b8b4 100644 (file)
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.workflow.client</artifactId>
     <name>services.workflow.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -45,7 +45,7 @@
             <artifactId>org.collectionspace.services.dimension.client</artifactId> <!-- Dimension instances are used as a unit-tests targets -->
             <version>${project.version}</version>
         </dependency>
-<!-- External dependencies -->        
+<!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <!-- filter out unwanted jars -->
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -74,7 +67,7 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-workflow-client</finalName>
     </build>
index 925355dff3ab125d8582f53a332154313e04a76b..df8dd2d1e0b34a9a2c7fb4a35ec04dd26a67af9d 100644 (file)
@@ -3,14 +3,14 @@
 
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.workflow</artifactId>        
+        <artifactId>org.collectionspace.services.workflow</artifactId>
         <version>5.2-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.workflow.service</artifactId>
     <name>services.workflow.service</name>
-    <packaging>jar</packaging>       
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- External dependencies -->        
+        <!-- External dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -32,7 +32,7 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
-        
+
       <!-- javax -->
 
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
-        
+
         <!-- jboss -->
 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -66,7 +60,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
-        
+
         <!-- nuxeo -->
 
         <dependency>
@@ -80,9 +74,8 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-workflow</finalName>
     </build>
 </project>
-