From b7d7ad6f1c623c292ad798f5ac6f11bad988cfc5 Mon Sep 17 00:00:00 2001 From: Sanjay Dalal Date: Thu, 17 Dec 2009 19:09:58 +0000 Subject: [PATCH] NOJIRA - Moved authentication test to new module named security as it depends on account and collectionobject clients. security.client is the last module. Enabled account module in service build that was disabled by #1076. D services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java M services/authentication/client/pom.xml M services/pom.xml _M services/contact/jaxb M services/build.xml A services/security A services/security/pom.xml AM services/security/client A services/security/client/src A services/security/client/src/test A services/security/client/src/test/java A services/security/client/src/test/java/org A services/security/client/src/test/java/org/collectionspace A services/security/client/src/test/java/org/collectionspace/services A services/security/client/src/test/java/org/collectionspace/services/authentication A services/security/client/src/test/java/org/collectionspace/services/authentication/client A services/security/client/src/test/java/org/collectionspace/services/authentication/client/test A + services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java A services/security/client/src/test/resources A services/security/client/src/test/resources/META-INF A services/security/client/src/test/resources/META-INF/persistence.xml A services/security/client/src/test/resources/log4j.properties A services/security/client/src/test/resources/hibernate.cfg.xml A services/security/client/src/main A services/security/client/pom.xml A services/security/client/build.xml A services/security/build.xml --- services/authentication/client/pom.xml | 2 +- services/build.xml | 1 - services/pom.xml | 5 +- services/security/build.xml | 127 ++++++++++++++ services/security/client/build.xml | 156 ++++++++++++++++++ services/security/client/pom.xml | 128 ++++++++++++++ .../test}/AuthenticationServiceTest.java | 2 +- .../test/resources/META-INF/persistence.xml | 19 +++ .../src/test/resources/hibernate.cfg.xml | 24 +++ .../src/test/resources/log4j.properties | 23 +++ services/security/pom.xml | 48 ++++++ 11 files changed, 530 insertions(+), 5 deletions(-) create mode 100644 services/security/build.xml create mode 100644 services/security/client/build.xml create mode 100644 services/security/client/pom.xml rename services/{authentication/client/src/test/java/org/collectionspace/services/authentication/client => security/client/src/test/java/org/collectionspace/services/authentication/client/test}/AuthenticationServiceTest.java (99%) create mode 100644 services/security/client/src/test/resources/META-INF/persistence.xml create mode 100644 services/security/client/src/test/resources/hibernate.cfg.xml create mode 100644 services/security/client/src/test/resources/log4j.properties create mode 100644 services/security/pom.xml diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 44c8cf0fb..4d0086b8c 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -90,7 +90,7 @@ - cspace-services-collectionobject-client + cspace-services-authentication-client maven-antrun-plugin diff --git a/services/build.xml b/services/build.xml index 02d4002d4..b040be636 100644 --- a/services/build.xml +++ b/services/build.xml @@ -151,7 +151,6 @@ - diff --git a/services/pom.xml b/services/pom.xml index d8e530a07..ac2cedd59 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -15,7 +15,8 @@ authentication common - + client + account relation acquisition @@ -26,9 +27,9 @@ dimension contact JaxRsServiceProvider - client sdk IntegrationTests + security diff --git a/services/security/build.xml b/services/security/build.xml new file mode 100644 index 000000000..bada91b1b --- /dev/null +++ b/services/security/build.xml @@ -0,0 +1,127 @@ + + + + security service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + < + + + + + + + diff --git a/services/security/client/build.xml b/services/security/client/build.xml new file mode 100644 index 000000000..028510b90 --- /dev/null +++ b/services/security/client/build.xml @@ -0,0 +1,156 @@ + + + + collectionspace security service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml new file mode 100644 index 000000000..80f815c0b --- /dev/null +++ b/services/security/client/pom.xml @@ -0,0 +1,128 @@ + + + + + org.collectionspace.services.security + org.collectionspace.services + 1.0 + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.security.client + 1.0 + services.security.client + + + + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-log4j12 + test + + + org.collectionspace.services + org.collectionspace.services.client + 1.0 + + + + org.collectionspace.services + org.collectionspace.services.authentication.client + 1.0 + + + org.collectionspace.services + org.collectionspace.services.account.client + 1.0 + + + org.collectionspace.services + org.collectionspace.services.collectionobject.client + 1.0 + + + org.testng + testng + 5.6 + + + org.jboss.resteasy + resteasy-jaxrs + 1.0.2.GA + + + + tjws + webserver + + + + + org.jboss.resteasy + resteasy-jaxb-provider + 1.0.2.GA + + + org.jboss.resteasy + resteasy-multipart-provider + 1.0.2.GA + + + commons-httpclient + commons-httpclient + 3.1 + + + + + cspace-services-security-client + + + maven-antrun-plugin + + + subs-hibernate-config + generate-test-resources + + run + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + log4j.configuration + file:target/test-classes/log4j.properties + + + + + + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + + + diff --git a/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java b/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java similarity index 99% rename from services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java rename to services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java index 3ead7909a..7e6823e4e 100644 --- a/services/authentication/client/src/test/java/org/collectionspace/services/authentication/client/AuthenticationServiceTest.java +++ b/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.collectionspace.services.authentication.client; +package org.collectionspace.services.authentication.client.test; import java.util.ArrayList; import java.util.List; diff --git a/services/security/client/src/test/resources/META-INF/persistence.xml b/services/security/client/src/test/resources/META-INF/persistence.xml new file mode 100644 index 000000000..97d00a01d --- /dev/null +++ b/services/security/client/src/test/resources/META-INF/persistence.xml @@ -0,0 +1,19 @@ + + + + org.collectionspace.services.authentication.User + org.collectionspace.services.authentication.Role + org.collectionspace.services.authentication.UserRole + + + + + + + diff --git a/services/security/client/src/test/resources/hibernate.cfg.xml b/services/security/client/src/test/resources/hibernate.cfg.xml new file mode 100644 index 000000000..8296399cf --- /dev/null +++ b/services/security/client/src/test/resources/hibernate.cfg.xml @@ -0,0 +1,24 @@ + + + + + + + @DB_URL@ + @DB_DRIVER_CLASS@ + @DB_USER@ + @DB_PASSWORD@ + @DB_DIALECT@ + org.hibernate.transaction.JDBCTransactionFactory + thread + true + + diff --git a/services/security/client/src/test/resources/log4j.properties b/services/security/client/src/test/resources/log4j.properties new file mode 100644 index 000000000..5d288d87d --- /dev/null +++ b/services/security/client/src/test/resources/log4j.properties @@ -0,0 +1,23 @@ +log4j.rootLogger=debug, stdout, R + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# Pattern to output the caller's file name and line number. +log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=target/test-client.log + +log4j.appender.R.MaxFileSize=100KB +# Keep one backup file +log4j.appender.R.MaxBackupIndex=1 + +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +#packages +log4j.logger.org.collectionspace=DEBUG +log4j.logger.org.apache=INFO +log4j.logger.httpclient=INFO +log4j.logger.org.jboss.resteasy=WARN diff --git a/services/security/pom.xml b/services/security/pom.xml new file mode 100644 index 000000000..662083257 --- /dev/null +++ b/services/security/pom.xml @@ -0,0 +1,48 @@ + + + + org.collectionspace.services.main + org.collectionspace.services + 1.0 + + 4.0.0 + org.collectionspace.services + 1.0 + org.collectionspace.services.security + pom + services.security + + + + + + client + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + + + -- 2.47.3