[jboss-cvs] JBossAS SVN: r68111 - in trunk/testsuite: imports/sections and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 10 11:12:54 EST 2007
Author: adrian at jboss.org
Date: 2007-12-10 11:12:54 -0500 (Mon, 10 Dec 2007)
New Revision: 68111
Added:
trunk/testsuite/imports/sections/dummy.xml
trunk/testsuite/src/resources/dummy/
trunk/testsuite/src/resources/dummy/empty.txt
Modified:
trunk/testsuite/imports/sections/classloader.xml
trunk/testsuite/imports/test-jars.xml
trunk/testsuite/src/main/org/jboss/test/classloader/resource/ResourceTest.java
trunk/testsuite/src/resources/classloader/concurrentloader/application.xml
trunk/testsuite/src/resources/classloader/resource/application.xml
Log:
Create a dummy deployment for use in test ears that have no modules in application.xml
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2007-12-10 16:09:54 UTC (rev 68110)
+++ trunk/testsuite/imports/sections/classloader.xml 2007-12-10 16:12:54 UTC (rev 68111)
@@ -20,6 +20,7 @@
</metainf>
<fileset dir="${build.lib}">
<include name="concurrentloader.sar"/>
+ <include name="tests-dummy.jar"/>
</fileset>
</ear>
@@ -177,6 +178,7 @@
</fileset>
<fileset dir="${build.lib}">
<include name="loading.sar"/>
+ <include name="tests-dummy.jar"/>
</fileset>
</ear>
@@ -190,6 +192,8 @@
<include name="jboss-app.xml"/>
</fileset>
</copy>
+ <mkdir dir="${ear1.dist}/tests-dummy.jar/"/>
+ <unzip src="${build.lib}/tests-dummy.jar" dest="${ear1.dist}/tests.dummy.jar"/>
<mkdir dir="${ear1.dist}/loading.sar/META-INF"/>
<unzip src="${build.lib}/loading.sar" dest="${ear1.dist}/loading.sar"/>
<copy file="${build.resources}/classloader/resource/jboss-serviceX.xml"
@@ -211,6 +215,8 @@
<include name="jboss-app.xml"/>
</fileset>
</copy>
+ <mkdir dir="${ear2.dist}/tests-dummy.jar/"/>
+ <unzip src="${build.lib}/tests-dummy.jar" dest="${ear2.dist}/tests.dummy.jar"/>
<mkdir dir="${ear2.dist}/loading.tmp/META-INF"/>
<unzip src="${build.lib}/loading.sar" dest="${ear2.dist}/loading.tmp"/>
<copy file="${build.resources}/classloader/resource/jboss-serviceX.xml"
Added: trunk/testsuite/imports/sections/dummy.xml
===================================================================
--- trunk/testsuite/imports/sections/dummy.xml (rev 0)
+++ trunk/testsuite/imports/sections/dummy.xml 2007-12-10 16:12:54 UTC (rev 68111)
@@ -0,0 +1,14 @@
+<project name="tests-dummy-jars">
+ <!-- dummy -->
+ <target name="_jars-dummy">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build dummy.jar -->
+ <jar destfile="${build.lib}/tests-dummy.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.resources}/dummy">
+ <include name="**"/>
+ </fileset>
+ </jar>
+ </target>
+</project>
Property changes on: trunk/testsuite/imports/sections/dummy.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2007-12-10 16:09:54 UTC (rev 68110)
+++ trunk/testsuite/imports/test-jars.xml 2007-12-10 16:12:54 UTC (rev 68111)
@@ -7,6 +7,7 @@
| Import the sections the jar targets.
| Refer to http://jira.jboss.com/jira/browse/JBQA-263
-->
+ <import file="sections/dummy.xml"/>
<import file="sections/aop.xml"/>
<import file="sections/bank.xml"/>
<import file="sections/bench.xml"/>
@@ -78,6 +79,7 @@
-->
<target name="jars" description="Builds all jar files."
depends="compile,
+ _jars-dummy,
_jars-aop,
_jars-bank,
_jars-bank-new,
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/resource/ResourceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/resource/ResourceTest.java 2007-12-10 16:09:54 UTC (rev 68110)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/resource/ResourceTest.java 2007-12-10 16:12:54 UTC (rev 68111)
@@ -123,9 +123,9 @@
URL resURL = loader.getResource("standardjboss.xml");
if (resURL == null)
throw new Exception("Cannot find standardjboss.xml");
- resURL = loader.getResource("log4j.xml");
+ resURL = loader.getResource("jboss-log4j.xml");
if (resURL == null)
- throw new Exception("Cannot find log4j.xml");
+ throw new Exception("Cannot find jboss-log4j.xml");
resURL = loader.getResource("jndi.properties");
if (resURL == null)
throw new Exception("Cannot find jndi.properties");
Modified: trunk/testsuite/src/resources/classloader/concurrentloader/application.xml
===================================================================
--- trunk/testsuite/src/resources/classloader/concurrentloader/application.xml 2007-12-10 16:09:54 UTC (rev 68110)
+++ trunk/testsuite/src/resources/classloader/concurrentloader/application.xml 2007-12-10 16:12:54 UTC (rev 68111)
@@ -3,5 +3,6 @@
"http://java.sun.com/dtd/application_1_3.dtd">
<application>
- <display-name>Concurrent Loading EAR</display-name>
+ <display-name>test</display-name>
+ <module><java>tests-dummy.jar</java></module>
</application>
Modified: trunk/testsuite/src/resources/classloader/resource/application.xml
===================================================================
--- trunk/testsuite/src/resources/classloader/resource/application.xml 2007-12-10 16:09:54 UTC (rev 68110)
+++ trunk/testsuite/src/resources/classloader/resource/application.xml 2007-12-10 16:12:54 UTC (rev 68111)
@@ -3,6 +3,7 @@
"http://java.sun.com/dtd/application_1_3.dtd">
<application>
- <display-name>Resource Loading Ear</display-name>
+ <display-name>test</display-name>
+ <module><java>tests-dummy.jar</java></module>
</application>
Added: trunk/testsuite/src/resources/dummy/empty.txt
===================================================================
--- trunk/testsuite/src/resources/dummy/empty.txt (rev 0)
+++ trunk/testsuite/src/resources/dummy/empty.txt 2007-12-10 16:12:54 UTC (rev 68111)
@@ -0,0 +1 @@
+EMPTY
More information about the jboss-cvs-commits
mailing list