From 8f20a3a72008f27527510925831a90b3b4f21214 Mon Sep 17 00:00:00 2001 From: remillet Date: Wed, 4 Mar 2015 12:13:54 -0800 Subject: [PATCH] CSPACE-6375: Changes to get ant import task working again. --- services/JaxRsServiceProvider/pom.xml | 30 -- services/authorization-mgt/client/pom.xml | 2 - services/authorization-mgt/import/pom.xml | 483 ++++++++++-------- .../src/main/resources/log4j.properties | 6 +- services/authorization-mgt/service/pom.xml | 1 - services/authorization/pom.xml | 5 +- services/authorization/service/pom.xml | 1 - services/pom.xml | 5 + 8 files changed, 281 insertions(+), 252 deletions(-) diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index fcaeb487b..e7c377700 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -332,36 +332,6 @@ ${spring.version} provided - diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index 423f22876..67faf26af 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -83,7 +83,6 @@ commons-httpclient commons-httpclient - 3.1 @@ -143,7 +142,6 @@ net.sf.ehcache ehcache - 1.6.2 true diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index fdaaf8a08..e5d7e7966 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -1,174 +1,242 @@ - - - org.collectionspace.services - org.collectionspace.services.authorization-mgt - 4.2-SNAPSHOT - + + + org.collectionspace.services + org.collectionspace.services.authorization-mgt + 4.2-SNAPSHOT + - 4.0.0 - org.collectionspace.services.authorization-mgt.import - services.authorization-mgt.import - - false - 3.0.0.RELEASE - 3.0.2.RELEASE - - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - - org.collectionspace.services - org.collectionspace.services.authentication.service - ${project.version} - provided - - - org.collectionspace.services - org.collectionspace.services.authorization.service - ${project.version} - provided - - - org.collectionspace.services - org.collectionspace.services.authorization.jaxb - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.config + 4.0.0 + org.collectionspace.services.authorization-mgt.import + services.authorization-mgt.import + + false + 3.0.0.RELEASE + 3.0.2.RELEASE + + + + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + + org.collectionspace.services + org.collectionspace.services.authentication.service ${project.version} - - - org.collectionspace.services - org.collectionspace.services.common - ${project.version} - provided - - - org.collectionspace.services - org.collectionspace.services.account.client - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.authorization-mgt.service - ${project.version} - provided - - - org.collectionspace.services - org.collectionspace.services.authorization-mgt.client - ${project.version} - - - - org.testng - testng - - - commons-cli - commons-cli - - - org.springframework.security - spring-security-core - ${spring.security.version} - provided - - - org.springframework.security - spring-security-config - ${spring.security.version} - provided - - - org.springframework.security - spring-security-acl - ${spring.security.version} - provided - - - org.springframework.security - spring-security-web - ${spring.security.version} - provided - - - org.springframework - spring-context - ${spring.version} - provided - - - org.springframework - spring-context-support - ${spring.version} - provided - - - org.springframework - spring-aop - ${spring.version} - provided - - - aopalliance - aopalliance - 1.0 - provided - - - - net.sf.ehcache - ehcache - 1.6.2 - true - - - mysql - mysql-connector-java - - - postgresql - postgresql - - - ch.elca.el4j.modules - module-xml_merge-common - 3.1 - - - + provided + + + org.collectionspace.services + org.collectionspace.services.authorization.service + ${project.version} + provided + + + org.collectionspace.services + org.collectionspace.services.authorization.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.config + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.account.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.authorization-mgt.client + ${project.version} + + + + org.testng + testng + + + commons-cli + commons-cli + + + org.springframework.security + spring-security-core + ${spring.security.version} + provided + + + org.springframework.security + spring-security-config + ${spring.security.version} + provided + + + org.springframework.security + spring-security-acl + ${spring.security.version} + provided + + + org.springframework.security + spring-security-web + ${spring.security.version} + provided + + + org.springframework + spring-context + ${spring.version} + provided + + + org.springframework + spring-context-support + ${spring.version} + provided + + + org.springframework + spring-aop + ${spring.version} + provided + + + aopalliance + aopalliance + 1.0 + provided + + + + net.sf.ehcache + ehcache + 1.6.2 + + + mysql + mysql-connector-java + + + postgresql + postgresql + + + ch.elca.el4j.modules + module-xml_merge-common + 3.1 + + + org.collectionspace.services + + org.collectionspace.services.authorization-mgt.service + + ${project.version} + + + nuxeo-core-query + org.nuxeo.ecm.core + + + nuxeo-opencmis-bindings + org.nuxeo.ecm.core + + + nuxeo-runtime + org.nuxeo.runtime + + + nuxeo-core-api + org.nuxeo.ecm.core + + + nuxeo-platform-types-core + org.nuxeo.ecm.platform + + + + nuxeo-platform-filemanager-api + + org.nuxeo.ecm.platform + + + nuxeo-core-schema + org.nuxeo.ecm.core + + + nuxeo-platform-mimetype-api + org.nuxeo.ecm.platform + + + nuxeo-core-io + org.nuxeo.ecm.core + + + nuxeo-platform-types-api + org.nuxeo.ecm.platform + + + nuxeo-runtime-launcher + org.nuxeo.lib.runtime + + + nuxeo-core-storage-sql-ra + org.nuxeo.ecm.core + + + nuxeo-platform-imaging-core + org.nuxeo.ecm.platform + + + nuxeo-runtime-osgi + org.nuxeo.runtime + + + nuxeo-platform-imaging-api + org.nuxeo.ecm.platform + + + nuxeo-core-convert + org.nuxeo.ecm.core + + + + nuxeo-platform-mimetype-core + + org.nuxeo.ecm.platform + + + nuxeo-core-storage-sql + org.nuxeo.ecm.core + + + + + + - - cspace-services-authorization-mgt-import - - ../../../build.properties - - - - src/main/resources - true - - - + + cspace-services-authorization-mgt-import + + ../../../build.properties + + + + src/main/resources + true + + + org.apache.maven.plugins maven-resources-plugin @@ -182,56 +250,45 @@ - - org.codehaus.mojo - exec-maven-plugin - - - - java - - - - - org.collectionspace.ImportAuthz - - -g - ${generate_only} - -u - SPRING_ADMIN - -p - does_not_matter - -b - - ${env.CSPACE_JEESERVER_HOME} - -edir - ${basedir}/target - - - - - - - + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + org.collectionspace.ImportAuthz + + -g + ${generate_only} + -u + SPRING_ADMIN + -p + does_not_matter + -b + + ${env.CSPACE_JEESERVER_HOME} + -edir + ${basedir}/target + + + + + + postgresql postgresql ${postgres.driver.version} - - - - - - - + + + + diff --git a/services/authorization-mgt/import/src/main/resources/log4j.properties b/services/authorization-mgt/import/src/main/resources/log4j.properties index 73353f981..1078dec6f 100644 --- a/services/authorization-mgt/import/src/main/resources/log4j.properties +++ b/services/authorization-mgt/import/src/main/resources/log4j.properties @@ -34,12 +34,12 @@ log4j.logger.javax.persistence.PersistenceException=ERROR # # REM - 3/3/2015 temp for debugging # -log4j.logger.org.springframework=TRACE +log4j.logger.org.springframework=ERROR log4j.logger.net.sf.ehcache=TRACE # # Logging for the command line tool that generates the Service artifacts # -#log4j.logger.org.collectionspace=INFO, commandline -#log4j.additivity.org.collectionspace=false +log4j.logger.org.collectionspace=INFO, commandline +log4j.additivity.org.collectionspace=false diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index b6040ff06..5d041675c 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -157,7 +157,6 @@ net.sf.ehcache ehcache - 1.6.2 true diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml index 9e3cf312d..f2e760ca7 100644 --- a/services/authorization/pom.xml +++ b/services/authorization/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 org.collectionspace.services.main org.collectionspace.services 4.2-SNAPSHOT - org.collectionspace.services org.collectionspace.services.authorization services.authorization pom diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 38ad0d210..a7ca7ebc6 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -136,7 +136,6 @@ net.sf.ehcache ehcache - 1.6.2 true diff --git a/services/pom.xml b/services/pom.xml index 0dd3513db..db891395e 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -276,6 +276,11 @@ + + net.sf.ehcache + ehcache + 2.7.7 + servlet-api javax.servlet -- 2.47.3