CSPACE-6007: Applied CSPACE-4711 fix to Ant buildfiles. Added test resources director...

diff --git a/services/citation/3rdparty/build.xml b/services/citation/3rdparty/build.xml
index 56bf81e2198bed62000b576ca87b156aafa65dba..6f1d14665944b6e4924991128a6d5f88a74cdd64 100644 (file)
--- a/services/citation/3rdparty/build.xml
+++ b/services/citation/3rdparty/build.xml
@@ -8,7 +8,7 @@
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="" />
+    <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
 
     <condition property="osfamily-unix">

diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml
index ccba13ef9c442c82da04b6eff93c2bad756174ab..312998a18e37d63ca18fdf9541ee4cad051af192 100644 (file)
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/build.xml
@@ -8,7 +8,7 @@
     <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="" />
+    <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
     <property name="nuxeo.citation.jar"
         value="org.collectionspace.services.citation.3rdparty.smk.nuxeo-${cspace.release}.jar"/>

diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
index a6a31ecb7f8044f2cda02894a9d07955cc64d3c5..6d793b26d2322726b67bd16667c8e977109c8a4a 100644 (file)
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/build.xml
@@ -8,7 +8,7 @@
     <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="" />
+    <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
     <property name="nuxeo.citation.jar"
         value="org.collectionspace.services.citation.3rdparty.nuxeo-${cspace.release}.jar"/>

diff --git a/services/citation/build.xml b/services/citation/build.xml
index c64e93901eeab5b1397850a62afe36c4ad2807d6..6b8aba0c66b4f57734519a507d20ecb78e97ea8c 100644 (file)
--- a/services/citation/build.xml
+++ b/services/citation/build.xml
@@ -8,7 +8,7 @@
         <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="" />
+    <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
 
     <condition property="osfamily-unix">

diff --git a/services/citation/client/src/test/resources/log4j.properties b/services/citation/client/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..148a3e8
--- /dev/null
+++ b/services/citation/client/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO

diff --git a/services/citation/installer/build.xml b/services/citation/installer/build.xml
index e823273689515fceb142205ed7e5f921be50ecd3..0d28e0ceeecb13ce64bb2a2161d7d2f8a50a5f89 100644 (file)
--- a/services/citation/installer/build.xml
+++ b/services/citation/installer/build.xml
@@ -6,7 +6,7 @@
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <property file="${services.trunk}/build.properties" />
-    <property name="mvn.opts" value="" />
+    <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
 
     <condition property="osfamily-unix">