You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2010/01/12 06:07:46 UTC

svn commit: r898182 - in /webservices/juddi/trunk/uddi-tck: log4j.properties pom.xml src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java

Author: tcunning
Date: Tue Jan 12 05:07:45 2010
New Revision: 898182

URL: http://svn.apache.org/viewvc?rev=898182&view=rev
Log:
JUDDI-304
Configure UDDI_090 test to use java.io.tmpdir and configure maven
so that java.io.tmpdir points to the default cargo/tomcat "temp" dir.

Modified:
    webservices/juddi/trunk/uddi-tck/log4j.properties
    webservices/juddi/trunk/uddi-tck/pom.xml
    webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java

Modified: webservices/juddi/trunk/uddi-tck/log4j.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/log4j.properties?rev=898182&r1=898181&r2=898182&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/log4j.properties (original)
+++ webservices/juddi/trunk/uddi-tck/log4j.properties Tue Jan 12 05:07:45 2010
@@ -17,7 +17,8 @@
 
 # in case any output is given to stdout, format it
 log4j.appender.UDDICLIENT=org.apache.log4j.FileAppender
-log4j.appender.UDDICLIENT.File=${catalina.home}/../uddiclient.log
+#log4j.appender.UDDICLIENT.File=${java.io.tmpdir}/uddiclient.log
+log4j.appender.UDDICLIENT.File=./temp/uddiclient.log
 log4j.appender.UDDICLIENT.MaxFileSize=512MB
 log4j.appender.UDDICLIENT.layout=org.apache.log4j.PatternLayout
 log4j.appender.UDDICLIENT.layout.ConversionPattern=%m%n

Modified: webservices/juddi/trunk/uddi-tck/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/pom.xml?rev=898182&r1=898181&r2=898182&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/pom.xml (original)
+++ webservices/juddi/trunk/uddi-tck/pom.xml Tue Jan 12 05:07:45 2010
@@ -126,9 +126,6 @@
 								<unzip dest="target" src="target/juddi-tomcat-3.0.1.SNAPSHOT.zip" />
 								<copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.version}/conf" overwrite="true"/>
 								<copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true"/>
-								<!--
-								     <copy file="${basedir}/log4j.xml" todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/log4j.xml"/>
-								-->
 							</tasks>
 						</configuration>
 						<goals>
@@ -169,6 +166,7 @@
 						<type>existing</type>
 						<home>${project.build.directory}/juddi-tomcat-3.0.1.SNAPSHOT</home>
 						<properties>
+							<cargo.logging>high</cargo.logging>
 							<cargo.hostname>localhost</cargo.hostname>
 							<cargo.servlet.port>8880</cargo.servlet.port>
 							<cargo.jvmargs>-Xms256m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=256M</cargo.jvmargs>
@@ -206,6 +204,10 @@
 							<name>derby.stream.error.file</name>
 							<value>target/derby.log</value>
 						</property>
+						<property>
+							<name>java.io.tmpdir</name>
+							<value>${basedir}/temp</value>
+						</property>
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -222,6 +224,10 @@
 									<name>cactus.contextURL</name>
 									<value>http://localhost:8880/juddi</value>
 								</property>
+								<property>
+									<name>java.io.tmpdir</name>
+									<value>${basedir}/temp</value>
+								</property>
 							</systemProperties>
 						</configuration>
 					</execution>

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=898182&r1=898181&r2=898182&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Tue Jan 12 05:07:45 2010
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
 
 import org.apache.commons.configuration.ConfigurationException;
@@ -114,7 +115,9 @@
 			String test="";
 			for (int i=0; i<200; i++) {
 				Thread.sleep(500);
-				test = readLogAsString("./target/uddiclient.log");
+				String tempdir = System.getProperty("java.io.tmpdir");
+
+				test = readLogAsString(tempdir + File.separator + "uddiclient.log");
 				System.out.print(".");
 				if (test.contains("<name xml:lang=\"en\">Notifier One</name>")) {
 					System.out.print("Found String");



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org