]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
NOJIRA: Pom file cleanup. Removed redundant maven-compiler-plugin declarations and...
authorRichard Millet <richard.millet@berkeley.edu>
Sat, 24 Apr 2010 05:28:55 +0000 (05:28 +0000)
committerRichard Millet <richard.millet@berkeley.edu>
Sat, 24 Apr 2010 05:28:55 +0000 (05:28 +0000)
63 files changed:
pom.xml
services/IntegrationTests/pom.xml
services/PerformanceTests/pom.xml
services/account/client/pom.xml
services/account/pom.xml
services/account/service/pom.xml
services/acquisition/client/pom.xml
services/acquisition/pom.xml
services/acquisition/service/pom.xml
services/authentication/client/pom.xml
services/authentication/pom.xml
services/authentication/service/pom.xml
services/authorization-mgt/client/pom.xml
services/authorization-mgt/pom.xml
services/authorization-mgt/service/pom.xml
services/authorization/service/pom.xml
services/client/pom.xml
services/collectionobject/client/pom.xml
services/collectionobject/pom.xml
services/collectionobject/service/pom.xml
services/common/pom.xml
services/contact/client/pom.xml
services/contact/pom.xml
services/contact/service/pom.xml
services/dimension/client/pom.xml
services/dimension/pom.xml
services/dimension/service/pom.xml
services/id/client/pom.xml
services/id/jaxb/pom.xml
services/id/pom.xml
services/id/service/pom.xml
services/id/service/src/test/resources/log4j.properties [new file with mode: 0644]
services/intake/client/pom.xml
services/intake/pom.xml
services/intake/service/pom.xml
services/loanin/client/pom.xml
services/loanin/pom.xml
services/loanin/service/pom.xml
services/loanout/client/pom.xml
services/loanout/pom.xml
services/loanout/service/pom.xml
services/organization/client/pom.xml
services/organization/import/pom.xml
services/organization/jaxb/pom.xml
services/organization/pom.xml
services/organization/service/pom.xml
services/person/client/pom.xml
services/person/import/pom.xml
services/person/jaxb/pom.xml
services/person/pom.xml
services/person/service/pom.xml
services/pom.xml
services/query/pom.xml
services/query/service/pom.xml
services/relation/client/pom.xml
services/relation/pom.xml
services/relation/service/pom.xml
services/security/client/pom.xml
services/security/pom.xml
services/vocabulary/client/pom.xml
services/vocabulary/import/pom.xml
services/vocabulary/pom.xml
services/vocabulary/service/pom.xml

diff --git a/pom.xml b/pom.xml
index 1924e1277963905b8992153d9a411ca468fe8515..f5c55220eaa334c0be0f895c81fb3015c121742a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
@@ -88,7 +88,7 @@
         </repository>\r
 \r
         <repository>\r
-            <id>jboss</id>\r
+            <id>jboss.org</id>\r
             <url>http://repository.jboss.org/maven2</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
@@ -96,7 +96,7 @@
         </repository>\r
         <!-- some security binaries available under .com only perhaps due to licensing issues -->\r
         <repository>\r
-            <id>jboss</id>\r
+            <id>jboss.com</id>\r
             <url>http://repository.jboss.com/maven2</url>\r
             <snapshots>\r
                 <enabled>false</enabled>\r
                 <updatePolicy>never</updatePolicy>\r
             </snapshots>\r
         </repository>\r
-\r
-        <!--\r
- -->\r
-\r
-\r
     </repositories>\r
 \r
     <pluginRepositories>\r
                     </configuration>\r
                 </plugin>\r
                 <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <groupId>org.apache.maven.plugins</groupId>                    \r
                     <artifactId>maven-compiler-plugin</artifactId>\r
+                    <version>2.3</version>\r
                     <configuration>\r
                         <source>1.6</source>\r
                         <target>1.6</target>\r
             </plugin>\r
         </plugins>\r
     </build>\r
+    \r
     <dependencyManagement>\r
         <dependencies>\r
             <dependency>\r
                 <artifactId>slf4j-log4j12</artifactId>\r
                 <version>1.5.2</version>\r
             </dependency>\r
-            <dependency>\r
+<!--            <dependency>\r
                 <groupId>net.java.dev.jaxb2-commons</groupId>\r
                 <artifactId>jaxb-fluent-api</artifactId>\r
-                <version>2.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
+                <version>2.0.2</version>\r
+            </dependency> -->\r
+<!--`            <dependency>\r
                 <groupId>org.testng</groupId>\r
                 <artifactId>testng</artifactId>\r
                 <version>5.6</version>\r
                 <scope>test</scope>\r
                 <classifier>jdk15</classifier>\r
-            </dependency>\r
-            <dependency>\r
+            </dependency> -->\r
+<!--            <dependency>\r
                 <groupId>mysql</groupId>\r
                 <artifactId>mysql-connector-java</artifactId>\r
                 <version>5.1.5</version>\r
                 <scope>test</scope>\r
-            </dependency>\r
-            <!-- Nuxeo Dependencies with versions\r
-            <dependency>\r
-                <groupId>org.nuxeo.common</groupId>\r
-                <artifactId>nuxeo-common</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.runtime</groupId>\r
-                <artifactId>nuxeo-runtime</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.runtime</groupId>\r
-                <artifactId>nuxeo-runtime-osgi</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-api</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-client</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-query</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-schema</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-io</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.nuxeo.ecm.core</groupId>\r
-                <artifactId>nuxeo-core-facade</artifactId>\r
-                <version>1.5.1-SNAPSHOT</version>\r
             </dependency> -->\r
         </dependencies>\r
     </dependencyManagement>\r
index 02bf7e5d4dbf514e28af811db89018084ab6c915..1cb6c08700f59979ab80fd93e6c49523fb407e40 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-IntegrationTests</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 575fb539a0d6d390c08b64bc018dd188f797079d..76ef91dac610e41116690e80f1e3e2097b89eaa8 100644 (file)
     <build>\r
         <finalName>collectionspace-services-PerformanceTests</finalName>\r
         <plugins>\r
+            <!-- By default, skip running these tests.  Use the profile "perftests" below\r
+                    to run the tests -i.e., mvn test -Pperftests -->\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
+                <artifactId>maven-surefire-plugin</artifactId>\r
                 <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
+                    <skip>true</skip>\r
                 </configuration>\r
             </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-surefire-plugin</artifactId>\r
-                               <configuration>\r
-                                       <skip>true</skip>\r
-                                       <systemProperties>\r
-                                               <property>\r
-                                                       <name>log4j.configuration</name>\r
-                                                       <value>file:target/test-classes/log4j.properties</value>\r
-                                               </property>\r
-                                       </systemProperties>\r
-                               </configuration>\r
-                       </plugin>\r
         </plugins>\r
     </build>\r
 \r
index 6a4cf67ef2649feb59fcef9811b60f6f79bc0aa2..1c823a79fc9966f4435d1ab1e284874bd568210a 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <scope>test</scope>\r
             <type>test-jar</type>\r
         </dependency> -->\r
-        <dependency>\r
-            <groupId>org.testng</groupId>\r
-            <artifactId>testng</artifactId>\r
-            <version>5.6</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
index d201af219c7fd493f5850986924307b87eb541d8..1b3f94a5bfb93938ea3ce9bf29ad1d55f7471d48 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <plugins>\r
-            \r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index d727ef8542b17155412933ba4fc667eeb5b5e083..aa53e88615638b0fc276975276709d0999a8a04c 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <!-- CollectionSpace Dependencies -->\r
         <dependency>\r
index 33a681a64774db162cdbf2f8c4ec715e88924ee4..091e9678f9d7145193cb2a49b1d8bbb280d4f6dd 100644 (file)
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     \r
     <build>\r
         <finalName>collectionspace-services-acquisition-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 038f17a8c65561bbc13c8168c288d4d05e900962..c9187f83271631e8894a83c25f43900cdfc9848d 100644 (file)
     </modules>\r
 \r
     <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
+        <plugins>            \r
         </plugins>\r
     </build>\r
 </project>\r
index da429159b568426ed8a563d03f9cd42917110133..ecbeed9ec2b8bf1bfd77e25a724c8998310a747c 100644 (file)
                     <jbossHome>${jboss.dir}</jbossHome>\r
                 </configuration>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                    <showDeprecation>true</showDeprecation>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index 691247356838854bb0d665d41acc843f91c64c83..1e02f05024a6ee1f03b1d075edd436b1161744f9 100644 (file)
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 \r
index 5937c8fb784ad4df059ca8157d9301b4c995f813..449ba7f21858abae54db3b2372901476d2a1a0d6 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.6</source>\r
-                        <target>1.6</target>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index 1fe4af387b2928eb593913ffc42519ed0a3674e7..4f4bfdfa1aefa910b5a157f8c6138bf00e6653c5 100644 (file)
@@ -78,9 +78,6 @@
 
     <build>
         <finalName>cspace-services-authn</finalName>
-        <plugins>
-            
-        </plugins>
     </build>
 </project>
 
index a1b81abef850479d38e48d26d5dd58efde1d6c9f..bc2952f846b536dda3fa3ce4c3f6b7c257d66181 100644 (file)
 \r
     <build>\r
         <finalName>cspace-services-authorization-mgt-client</finalName>\r
-        <plugins>\r
-            \r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
+        <plugins>            \r
         </plugins>\r
     </build>\r
 \r
index 747058d5aa36c55602f00751d4f903f1499ddfdb..af4e16a9cc9c2b694b04b14c904ce477d5466319 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>0.6-SNAPSHOT</version>
     </parent>
+
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization-mgt</artifactId>
     <name>services.authorization-mgt</name>
     <packaging>pom</packaging>
     <url>http://www.collectionspace.org</url>
+    
     <modules>
         <module>service</module>
         <module>client</module>
index 97e0ad3c703781ddb2abbbcdfba13003179034f3..7245c6bec9c193ad129ea53acad1adc89f9bf340 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<project>\r
+<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">\r
     <modelVersion>4.0.0</modelVersion>\r
     <parent>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
 \r
     <build>\r
         <finalName>collectionspace-services-authz-mgt</finalName>\r
-        <plugins>\r
-\r
-        </plugins>\r
     </build>\r
 </project>\r
index 8537fe960354422bbe05a843b6ecc1ee68442091..1d2cd6aed4c612d24d3443f6974f0f84ce0c3d8e 100644 (file)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
     <parent>
         <artifactId>org.collectionspace.services.authorization</artifactId>
                     <systemProperties>
                         <property>
                             <name>log4j.configuration</name>
-                            <value>file:target/test-classes/log4j.properties</value>
+                            <value>file:${project.build.directory}/test-classes/log4j.properties</value>
                         </property>
                         <property>
                             <name>spring-beans-config</name>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
index c8490bb039e6842481a12439a7153bcea4400dd2..a2e688b5ef4cedfa0a9ad7020884cb2a72a5b58c 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
+            <scope>provided</scope>\r
         </dependency>\r
 <!-- CollectionSpace dependencies -->\r
 <!--        <dependency>\r
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index 66d969a5401a76ac2936b5e146a2ab0c04be5f1b..dea32b8318f137c1b6558654b20fcb81a797ab75 100644 (file)
                 <configuration>\r
                     <systemProperties>\r
                         <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
+                            <name>test-data.fileName</name>\r
+                            <value>${project.build.directory}/test-classes/test-data</value>\r
                         </property>\r
                     </systemProperties>\r
                 </configuration>\r
             </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
+        \r
     </build>\r
 </project>
\ No newline at end of file
index e263cefc8d14768b77c63bcb0f26636aee5bdf0c..5c3f6fbc1fc40b76b5b89683877d474fd2311d96 100644 (file)
     </modules>\r
     \r
     <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
         <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 \r
-               <profiles>\r
-                       <profile>\r
-                               <id>samples</id>\r
-                   <modules>\r
-                       <module>sample</module>\r
-                   </modules>\r
-                       </profile>\r
-               </profiles>\r
+       <profiles>\r
+               <profile>\r
+                       <id>samples</id>\r
+           <modules>\r
+               <module>sample</module>\r
+           </modules>\r
+               </profile>\r
+       </profiles>\r
 \r
 </project>\r
 \r
index b156934860c3a07a42f100e3e065349ccb552ae2..9079f9406756a9e7f0dcd6d2f60ffdd7b0a32300 100644 (file)
     <build>\r
         <finalName>collectionspace-services-collectionobject</finalName>\r
         <plugins>\r
-\r
         </plugins>\r
     </build>\r
 </project>\r
index 17befac66853e4d577876f8f381d53fbcd08261c..503808fa024dbb8c107486a4821016efa1516c2c 100644 (file)
 \r
         <!-- Utilities -->\r
 \r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.1</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
             <version>1.2.14</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.1</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
 \r
         <!-- javax -->\r
         <dependency>\r
index 239eec16f1a8270e134ab86ca5d6771d5c7f7532..b7fe757477a2a77588bf957ef0290c9fca94882e 100644 (file)
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
         </dependency>
         <!-- CollectionSpace dependencies -->
         <dependency>
             <artifactId>testng</artifactId>
             <version>5.6</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.2</version>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
     
     <build>
         <finalName>collectionspace-services-contact-client</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:target/test-classes/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
 
index d108c0ef19a2b293369692af18e9ab741cce2dc4..0fdd89c94bd57ca89e1c91ed1b7592758e851d70 100644 (file)
         <module>client</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <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-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 
index 34096754d49921cbe9a156099fe5daa4e91ab087..13f1007cbb8a225909271d44e9e27930f9322f5d 100644 (file)
     
     <build>
         <finalName>collectionspace-services-contact</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jboss-maven-plugin</artifactId>
-                <configuration>
-                    <jbossHome>${jboss.dir}</jbossHome>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
 
index 905185939832c595a336b9492e95d3b41ce530ae..f2b9a97732e46c9415e83f64d3881371543be721 100644 (file)
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     \r
     <build>\r
         <finalName>collectionspace-services-dimension-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 8c1be2250c341939d811d0470503910ab1721f16..f79ad2fade25b818ef5fdaba8343fa90fc749158 100644 (file)
     <name>services.dimension</name>\r
     <packaging>pom</packaging>\r
 \r
+    <dependencies>\r
+        <!-- keep slf4j dependencies on the top -->\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+        </dependency>\r
+    </dependencies>\r
+    \r
     <modules>\r
         <module>jaxb</module>\r
         <module>service</module>\r
         <module>3rdparty</module>\r
         <module>client</module>\r
     </modules>\r
-\r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
+    \r
 </project>\r
 \r
index 99d21dbbc21347d8fd16f7f6414c77ff7c54a1ca..f9fd0f45bcbf81b86ec1a1feaf2c7ce286399682 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-dimension</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                    <showDeprecation>true</showDeprecation>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index e7a7f7748570e998cc8a41e8c6821bc402bd5c2b..23917b6a7b52864b86eeaf3ddbdd1922102b5dde 100644 (file)
 
     <build>
         <finalName>cspace-services-id-client</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:target/test-classes/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
 
index e5050b9e919bc3937e28807d6670f5d8cb429f1b..a64567d03f7f78135e39cbfe715aea8ddabf2536 100644 (file)
 <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.id</artifactId>
-        <version>0.6-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org.collectionspace.services.id.jaxb</artifactId>
-    <name>services.id.jaxb</name>
+    <artifactId>org.collectionspace.services.id</artifactId>
+    <version>0.6-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.collectionspace.services</groupId>
+  <artifactId>org.collectionspace.services.id.jaxb</artifactId>
+  <name>services.id.jaxb</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.jaxb2-commons</groupId>
+      <artifactId>property-listener-injector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.jaxb2_commons</groupId>
+      <artifactId>runtime</artifactId>
+    </dependency>
+  </dependencies>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2-commons</groupId>
-            <artifactId>property-listener-injector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>runtime</artifactId>
-        </dependency>
-    </dependencies>
-   
   <build>
     <finalName>collectionspace-services-id-jaxb</finalName>
     <defaultGoal>install</defaultGoal>
     <plugins>
-    
       <plugin>
         <groupId>org.jvnet.jaxb2.maven2</groupId>
         <artifactId>maven-jaxb2-plugin</artifactId>
       </plugin>
-
     </plugins>
   </build>
 
index 103f1b1ce7919bc60b82e366c66533e21492b506..085b8982a6c26346aeee6025ce41085fe7465898 100644 (file)
     <!-- <module>client</module> -->
   </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
 
 
index f80e6c5ce019ce1693f42b1557c7786438d7bed7..45d265ff63e48cf4b64a0ab18bb1458e807a65fa 100644 (file)
@@ -16,8 +16,7 @@
  $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $
 -->
 
-<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">
 
@@ -26,7 +25,7 @@
     <groupId>org.collectionspace.services</groupId>
     <version>0.6-SNAPSHOT</version>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.collectionspace.services</groupId>
   <artifactId>org.collectionspace.services.id.service</artifactId>
   <name>services.id.service</name>
 
   <dependencies>
-  
+
     <!-- Code common to all CollectionSpace services. -->
     <dependency>
       <groupId>org.collectionspace.services</groupId>
       <artifactId>org.collectionspace.services.common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <!-- JUnit, a testing framework. -->
     <!-- NOTE: Versions later than 4.1 - such as 4.5 - are available. -->
     <dependency>
@@ -50,7 +49,7 @@
       <version>4.1</version>
       <scope>test</scope>
     </dependency>
-    
+
     <!-- TestNG, a testing framework. -->
     <!-- NOTE: Versions later than 5.6 - such as 5.8 - are available. -->
     <dependency>
@@ -60,7 +59,7 @@
     </dependency>
 
     <!-- javax Security, a Java framework for authentication and authorization. -->
-    <!-- JAAS support: is javax security needed with JAAS's incorporation into JDK 1.4? --> 
+    <!-- JAAS support: is javax security needed with JAAS's incorporation into JDK 1.4? -->
     <dependency>
       <groupId>javax.security</groupId>
       <artifactId>jaas</artifactId>
@@ -75,7 +74,7 @@
       <version>1.6.1</version>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- JBoss RESTEasy, a framework for providing and consuming RESTful services. -->
     <!-- NOTE: Versions later than 1.0.2.GA - such as 1.1 GA - are available. -->
     <!-- JAX-RS support, a Java specification for RESTful services. -->
       <artifactId>resteasy-multipart-provider</artifactId>
       <version>1.0.2.GA</version>
     </dependency>
-    
+
     <!-- Cobertura, a tool for identifying the extent of code coverage in test classes -->
     <dependency>
       <groupId>org.codehaus.mojo</groupId>
       <artifactId>cobertura-maven-plugin</artifactId>
       <version>2.2</version>
     </dependency>
-    
+
     <!-- MySQL Connector, a JDBC driver for the MySQL DBMS -->
     <dependency>
       <groupId>mysql</groupId>
       <!--version>5.1.6</version-->
       <scope>test</scope>
     </dependency>
-    
+
     <!-- XStream, an XML serializer -->
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
     </dependency>
 
   </dependencies>
-  
+
   <!-- Build element: declares the project's directory structure and manages plugins. -->
   <build>
     <finalName>collectionspace-services-id</finalName>
-    <plugins>
-      <!-- Compiles Java sources, including test sources. -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
-
 </project>
-
diff --git a/services/id/service/src/test/resources/log4j.properties b/services/id/service/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..18c5103
--- /dev/null
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R\r
+\r
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender\r
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\r
+\r
+# Pattern to output the caller's file name and line number.\r
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+log4j.appender.R=org.apache.log4j.RollingFileAppender\r
+log4j.appender.R.File=target/test-client.log\r
+\r
+log4j.appender.R.MaxFileSize=100KB\r
+# Keep one backup file\r
+log4j.appender.R.MaxBackupIndex=1\r
+\r
+log4j.appender.R.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+#packages\r
+log4j.logger.org.collectionspace=DEBUG\r
+log4j.logger.org.apache=INFO\r
+log4j.logger.httpclient=INFO\r
+log4j.logger.org.jboss.resteasy=INFO\r
index 499910fa2ce9b3271e3cb6b5f7a64fe47efc50ea..1fc96a5cacb835255e0cf539e26b840af7a4839d 100644 (file)
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     \r
     <build>\r
         <finalName>collectionspace-services-intake-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 9c9cd2ed9a18a4c3884503466827d656b627c0ff..9f4e6ffa374b9a7e63fcd6c2503443650b9ebf9e 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index e87bf35f4ac859b85e6a834e67dcc53cbd91d0f8..13efb3e4b49ead32f3129abd9e3c145dee513444 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-intake</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                    <showDeprecation>true</showDeprecation>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 61716c67de20c0ee9427df7641ad989e1ed667e6..f81ebb84b656a1cbcc2a2f506369a99e97857e86 100644 (file)
     
     <build>
         <finalName>collectionspace-services-loanin-client</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:target/test-classes/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
index 84ac4e12ed3f08c9ca3fa81e4223ea263e61432c..1f055444012362a9caa760cdabb1ea45a39f7977 100644 (file)
         <module>client</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <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-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 
index 8cfe40bef3842b80bf89cf54a04f3043fe64fcc4..7f686e138abb6f5a3005f2aef0f861763648450d 100644 (file)
     
     <build>
         <finalName>collectionspace-services-loanin</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jboss-maven-plugin</artifactId>
-                <configuration>
-                    <jbossHome>${jboss.dir}</jbossHome>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
 
index f2ebfe1a2cc89e2b845cb534397f360a489ac4fb..cd0d3224ad97b954951b7f92ba1d2ac2f87a6d42 100644 (file)
     
     <build>
         <finalName>collectionspace-services-loanout-client</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:target/test-classes/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
index 675c049648b11dfa91df5b404425f064dab442a8..45f1ffa52b78d6e019a19c25e4fada900030265d 100644 (file)
         <module>client</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-                <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-war-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <configuration>
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 
index 545cb44ecd7dcd5989817a30c5f2323537ef60dd..4e0dee16c82e2bf4bd597bb77597b09320ce95b1 100644 (file)
     
     <build>
         <finalName>collectionspace-services-loanout</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jboss-maven-plugin</artifactId>
-                <configuration>
-                    <jbossHome>${jboss.dir}</jbossHome>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>
 
index ad452dc4352f59563e7ab99afd13ad9768fa9473..78e3227004a436eabb2a11c9b4ecf2e16344db38 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
-            <scope>test</scope>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
-            <scope>test</scope>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     \r
     <build>\r
         <finalName>collectionspace-services-organization-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 1827e4a9dd635561ba8af7e499b6896eb0c29a88..bd9da2fc16b83a8f6d273f78e1ea22f0d2ffb824 100644 (file)
                             </execution>\r
                          </executions>\r
                        </plugin>        \r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index 629155e8e8d78ba3d344d362c132b81dbe51fa9e..ca12bdb900e3586507179091a354eca8110391b8 100644 (file)
@@ -27,6 +27,7 @@
             <artifactId>runtime</artifactId>
         </dependency>
     </dependencies>
+    
     <build>
         <finalName>collectionspace-services-organization-jaxb</finalName>
         <defaultGoal>install</defaultGoal>
@@ -35,7 +36,6 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
-
         </plugins>
     </build>
 </project>
index 42b1a3c57fcd8a048308f9f5cd1a05d6dd4a5d2d..f8eadb7c7b147103d5bba5fffc65a27deff93706 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-\r
-               <profiles>\r
-                       <profile>\r
-                               <id>samples</id>\r
-                   <modules>\r
-               <module>import</module>\r
-               <module>sample</module>\r
-                   </modules>\r
-                       </profile>\r
-               </profiles>\r
+       <profiles>\r
+               <profile>\r
+                       <id>samples</id>\r
+           <modules>\r
+        <module>import</module>\r
+        <module>sample</module>\r
+           </modules>\r
+               </profile>\r
+       </profiles>\r
 \r
 </project>\r
 \r
index 35c5c6418052b063d0d5b797ce06a3b98c607a95..c967d8312f99d3a77b4f20be57a3f3f5600e93c1 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-organization</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 7f9a831915b0d0b5d80c52c29d97942b7f2827cc..674dc76a8ad538b401a06f0114b3a4b82b5d6cf5 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
-            <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
-            <scope>test</scope>\r
         </dependency>\r
         <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     <build>\r
         <finalName>collectionspace-services-person-client</finalName>\r
         <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index f60723624fde384e6194b00a73901b364f851c09..ad7f104250c003760afdc4379d09ceb92ee9dfc1 100644 (file)
                             </execution>\r
                          </executions>\r
                        </plugin>        \r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index 820654a2f41bae31506bd7a48380a4cd6963b30f..bfc4524cbf799d8163963568830af327877cb463 100644 (file)
@@ -27,6 +27,7 @@
             <artifactId>runtime</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <finalName>collectionspace-services-person-jaxb</finalName>
         <defaultGoal>install</defaultGoal>
index 6bb4f76dbecd87d12301b097123456a4a5aaab2b..bb04e5a26effb1d72fa2564c50fee037485b82f6 100644 (file)
         <module>3rdparty</module>\r
         <module>client</module>\r
     </modules>\r
-\r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
     \r
-               <profiles>\r
-                       <profile>\r
-                               <id>samples</id>\r
-                   <modules>\r
-               <module>import</module>\r
-               <module>sample</module>\r
-                   </modules>\r
-                       </profile>\r
-               </profiles>\r
+       <profiles>\r
+               <profile>\r
+                       <id>samples</id>\r
+           <modules>\r
+        <module>import</module>\r
+        <module>sample</module>\r
+           </modules>\r
+               </profile>\r
+       </profiles>\r
     \r
 </project>\r
 \r
index e356df97143bc02fbbc90c6f0e02e5478b3351d8..ea225889bf1dbba06a5aed9ee5860e8718d4104c 100644 (file)
     <build>\r
         <finalName>collectionspace-services-person</finalName>\r
         <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index 50e57ef2235b7296dab9816fa91312e403511ee7..b967399fd0afa21e6d708339957a5a6ed567359f 100644 (file)
@@ -14,7 +14,7 @@
 
     <modules>
         <module>authentication</module>
-        <module>authorization</module>
+<!--        <module>authorization</module> -->
         <module>client</module>
         <module>jaxb</module>
         <module>common</module>
         <module>PerformanceTests</module>
         <module>security</module>
     </modules>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+            <classifier>jdk15</classifier>
+        </dependency>
+    </dependencies>
 
     <repositories> </repositories>
 
         <pluginManagement>
             <plugins>
                 <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.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <systemProperties>
                             <property>
                                 <name>log4j.configuration</name>
-                                <value>file:target/test-classes/log4j.properties</value>
+                                <value>file:${project.build.directory}/test-classes/log4j.properties</value>
                             </property>
                         </systemProperties>
                     </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>
                         <persistenceUnitName>garbage</persistenceUnitName>
                     </configuration>
                 </plugin>
-
-                <!--plugin>
-                    <groupId>org.jvnet.jaxb2.maven2</groupId>
-                    <artifactId>maven-jaxb2-plugin</artifactId>
-                    <version>0.7.2</version>
-                </plugin-->
-
                 <plugin>
                     <groupId>org.jvnet.jaxb2.maven2</groupId>
                     <artifactId>maven-jaxb2-plugin</artifactId>
                                 <version>1.0</version>
                             </plugin>
                         </plugins>
-                        <!--generatePackage>
-                     org.collectionspace.hello
-                    </generatePackage-->
-                    </configuration>
-                </plugin>
-
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
                     </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>
+    
     <reporting>
         <plugins>
             <plugin>
     </reporting>
     <dependencyManagement>
         <dependencies>
-            <dependency>
+<!--            <dependency>
                 <groupId>net.java.dev.jaxb2-commons</groupId>
                 <artifactId>jaxb-fluent-api</artifactId>
                 <version>2.0.1</version>
+            </dependency> -->
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.2</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>basic</artifactId>
                 <version>0.4.1</version>
             </dependency>
-            <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>property-listener-injector</artifactId>
                 <artifactId>runtime</artifactId>
                 <version>0.4.1.4</version>
             </dependency>
-
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jaxrs</artifactId>
index e054046fc82005f306bcd1973435d1bf09da0f19..3915a6168d52d22ada0edf7aeda0027ab6680f51 100644 (file)
         <module>service</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index f60c5fc4eb567acddecb4f44956a73e6a15865a1..116deeca6c05ad8f1e972f344f7386c882ea509a 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-query</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index 06c21611b61aa38abfca083f087ce625ed2e088a..087d90c632ec7c8c4c4cad47d36d5562e7a40750 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
-            <scope>test</scope>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
-            <scope>test</scope>\r
+            <scope>provided</scope>\r
         </dependency>\r
         <!-- CollectionSpace dependencies -->\r
         <dependency>\r
 \r
     <build>\r
         <finalName>cspace-services-relation-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.5</source>\r
-                    <target>1.5</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
index 77dd2fc391639fb3cf53207b108eb346000d00ee..2982bdab05451fd231ce819d5cc21b2a4a34a7e9 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index 86e47c0fed3235aefe239f9c1381cadba13e7f1e..3770752fb196903618efe34064aab6993dc766aa 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-relation</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.5</source>\r
-                    <target>1.5</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
index 6c511f3c9e82efe7c014306026ab9c1104afe21a..e9b9461710d2453b0178fcebcc00fe943ddbc3b3 100644 (file)
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index ea60987cce28299017cf216a316e794ccdd38822..2fc7b7b22be2967c7c91b8f2d219553c1c779331 100644 (file)
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.6</source>\r
-                        <target>1.6</target>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
 </project>\r
 \r
index 790864d6dcfb2d547ef64c3da22f486b3607fe31..96f1bf873bcf5a8e70d433a8d934a0207bddb65d 100644 (file)
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
-            <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
-            <scope>test</scope>\r
         </dependency>\r
         <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
     \r
     <build>\r
         <finalName>collectionspace-services-vocabulary-client</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r
index c49afeb625b131418569b272f93dc2c34e21d4e0..2803614a3f9f4bc8636a67cb12df76967705ac41 100644 (file)
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration>\r
-                    <systemProperties>\r
-                        <property>\r
-                            <name>log4j.configuration</name>\r
-                            <value>file:target/test-classes/log4j.properties</value>\r
-                        </property>\r
-                    </systemProperties>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
         </plugins>\r
     </build>\r
 </project>\r
index b8c5ee844fcd45eed67a13616bac4335d50b9759..50b8109f36bbbe567c8b5b4a1c40b3a491168734 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
         <version>0.6-SNAPSHOT</version>\r
     </parent>\r
-    \r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
         <module>client</module>\r
     </modules>\r
 \r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <version>2.0.2</version>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-    \r
-               <profiles>\r
-                       <profile>\r
-                               <id>samples</id>\r
-                   <modules>\r
-               <module>import</module>\r
-               <module>sample</module>\r
-                   </modules>\r
-                       </profile>\r
-               </profiles>\r
-    \r
+    <profiles>\r
+        <profile>\r
+            <id>samples</id>\r
+            <modules>\r
+                <module>import</module>\r
+                <module>sample</module>\r
+            </modules>\r
+        </profile>\r
+    </profiles>\r
+\r
 </project>\r
 \r
index 53cce253df35699b2d8cb76657e39ae61dc72e7b..7b1560e4a039c5112ffb1cac6b39fd7f4f2c75e2 100644 (file)
     \r
     <build>\r
         <finalName>collectionspace-services-vocabulary</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.6</source>\r
-                    <target>1.6</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
     </build>\r
 </project>\r
 \r