[jboss-cvs] JBossAS SVN: r62200 - in branches/JBoss_4_0_2_JBAS-4201/testsuite: imports and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 10 03:01:03 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-04-10 03:01:03 -0400 (Tue, 10 Apr 2007)
New Revision: 62200
Added:
branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/txtimer/ejb/
branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/txtimer/
Modified:
branches/JBoss_4_0_2_JBAS-4201/testsuite/.classpath
branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/code-generation.xml
branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/test-jars.xml
branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/JBossTestServices.java
branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/log4j.xml
Log:
Port the JBAS-4201 related tests
Modified: branches/JBoss_4_0_2_JBAS-4201/testsuite/.classpath
===================================================================
--- branches/JBoss_4_0_2_JBAS-4201/testsuite/.classpath 2007-04-10 05:41:03 UTC (rev 62199)
+++ branches/JBoss_4_0_2_JBAS-4201/testsuite/.classpath 2007-04-10 07:01:03 UTC (rev 62200)
@@ -1,180 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/media/" kind="src" path="src/main">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="output/gen-src">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/tools">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/j2ee">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/management">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/jmx">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/common">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/system">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/varia">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/server">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/cluster">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/messaging">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/naming">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/connector">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/security">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/transaction">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/apache-commons/lib/commons-httpclient.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/tools/lib/ant.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/remoting">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/cache">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/media">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/jacorb-jacorb/lib/jacorb.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/iiop">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/webservice">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/tools/lib/ant-junit.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/hsqldb-hsqldb/lib/hsqldb.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/jboss.net">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/hibernate">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/jaxrpc">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aop.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aspect-library.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/deployment">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar">
- <attributes>
- </attributes>
- </classpathentry>
+ <classpathentry excluding="org/jboss/test/media/" kind="src" path="src/main"/>
+ <classpathentry kind="src" path="src/resources"/>
+ <classpathentry kind="src" path="output/gen-src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/tools"/>
+ <classpathentry kind="src" path="/j2ee"/>
+ <classpathentry kind="src" path="/management"/>
+ <classpathentry kind="src" path="/jmx"/>
+ <classpathentry kind="src" path="/common"/>
+ <classpathentry kind="src" path="/system"/>
+ <classpathentry kind="src" path="/varia"/>
+ <classpathentry kind="src" path="/server"/>
+ <classpathentry kind="src" path="/cluster"/>
+ <classpathentry kind="src" path="/messaging"/>
+ <classpathentry kind="src" path="/naming"/>
+ <classpathentry kind="src" path="/connector"/>
+ <classpathentry kind="src" path="/security"/>
+ <classpathentry kind="src" path="/transaction"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-commons/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit-junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar"/>
+ <classpathentry kind="lib" path="/tools/lib/ant.jar"/>
+ <classpathentry kind="src" path="/remoting"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="src" path="/cache"/>
+ <classpathentry kind="lib" path="/thirdparty/javagroups-javagroups/lib/jgroups.jar"/>
+ <classpathentry kind="src" path="/media"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jacorb-jacorb/lib/jacorb.jar"/>
+ <classpathentry kind="src" path="/iiop"/>
+ <classpathentry kind="src" path="/webservice"/>
+ <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/hsqldb-hsqldb/lib/hsqldb.jar"/>
+ <classpathentry kind="src" path="/jboss.net"/>
+ <classpathentry kind="src" path="/hibernate"/>
+ <classpathentry kind="src" path="/jaxrpc"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aop.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-aop/lib/jboss-aspect-library.jar"/>
+ <classpathentry kind="src" path="/deployment"/>
+ <classpathentry kind="lib" path="/thirdparty/dom4j-dom4j/lib/dom4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/code-generation.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/code-generation.xml 2007-04-10 05:41:03 UTC (rev 62199)
+++ branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/code-generation.xml 2007-04-10 07:01:03 UTC (rev 62200)
@@ -616,27 +616,6 @@
destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
</ejbdoclet>
- <!-- EJB Tx Timer Service Test Beans -->
- <mkdir dir="${build.resources}/txtimer/META-INF"/>
- <ejbdoclet destdir="${build.gen-src}"
- ejbspec="2.0"
- excludedtags="@version, at author">
- <fileset dir="${source.java}">
- <include name="org/jboss/test/txtimer/ejb/*Bean.java"/>
- </fileset>
- <packageSubstitution packages="ejb" substituteWith="interfaces"/>
- <remoteinterface/>
- <localinterface/>
- <homeinterface/>
- <localhomeinterface/>
- <deploymentdescriptor xmlencoding="UTF-8"
- destdir="${build.resources}/txtimer/META-INF"/>
- <jboss xmlencoding="UTF-8"
- version="3.2"
- destdir="${build.resources}/txtimer/META-INF"
- mergedir="${source.resources}/txtimer/"/>
- </ejbdoclet>
-
<!-- entity test -->
<mkdir dir="${build.resources}/entity/entity/META-INF"/>
<ejbdoclet destdir="${build.gen-src}"
Modified: branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/test-jars.xml 2007-04-10 05:41:03 UTC (rev 62199)
+++ branches/JBoss_4_0_2_JBAS-4201/testsuite/imports/test-jars.xml 2007-04-10 07:01:03 UTC (rev 62200)
@@ -4118,6 +4118,16 @@
<include name="ejb-timer.war"/>
</zipfileset>
</zip>
+ <!-- build jbas4201.jar -->
+ <zip destfile="${build.lib}/jbas4201.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/timer/ejb/TimerTestBean.class"/>
+ <include name="org/jboss/test/timer/interfaces/TimerTest*"/>
+ </fileset>
+ <zipfileset dir="${build.resources}/timer/jbas4201" prefix="META-INF">
+ <include name="*.xml"/>
+ </zipfileset>
+ </zip>
</target>
<!-- transaction test -->
Modified: branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/JBossTestServices.java 2007-04-10 05:41:03 UTC (rev 62199)
+++ branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/JBossTestServices.java 2007-04-10 07:01:03 UTC (rev 62200)
@@ -174,6 +174,14 @@
log.debug(file.getAbsolutePath() + " is a valid file");
return file.toURL().toString();
}
+ deployDir = "output/lib";
+ url = deployDir + "/" + filename;
+ file = new File(url);
+ if (file.exists())
+ {
+ log.debug(file.getAbsolutePath() + " is a valid file");
+ return file.toURL().toString();
+ }
else
{
log.debug("File does not exist, creating url: " + url);
Copied: branches/JBoss_4_0_2_JBAS-4201/testsuite/src/main/org/jboss/test/txtimer/ejb (from rev 62199, branches/Branch_4_0/testsuite/src/main/org/jboss/test/txtimer/ejb)
Modified: branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/log4j.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/log4j.xml 2007-04-10 05:41:03 UTC (rev 62199)
+++ branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/log4j.xml 2007-04-10 07:01:03 UTC (rev 62200)
@@ -22,7 +22,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
+ <param name="File" value="output/log/test.log"/>
<param name="Append" value="true"/>
<!-- Rollover at midnight each day -->
Copied: branches/JBoss_4_0_2_JBAS-4201/testsuite/src/resources/txtimer (from rev 62198, branches/Branch_4_0/testsuite/src/resources/txtimer)
More information about the jboss-cvs-commits
mailing list