|
From: Scott M S. <st...@us...> - 2003-08-01 20:00:06
|
User: starksm
Date: 03/08/01 13:00:04
Modified: . Tag: Branch_3_2 build.xml
Log:
Add 2 unpackaged ears to the resource loading test
Revision Changes Path
No revision
No revision
1.165.2.89 +51 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.88
retrieving revision 1.165.2.89
diff -u -r1.165.2.88 -r1.165.2.89
--- build.xml 30 Jul 2003 17:52:47 -0000 1.165.2.88
+++ build.xml 1 Aug 2003 20:00:03 -0000 1.165.2.89
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.88 2003/07/30 17:52:47 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.89 2003/08/01 20:00:03 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -3566,7 +3566,7 @@
</jar>
<!-- build loadingresource.sar -->
- <jar jarfile="${build.lib}/loadingresource.sar">
+ <jar jarfile="${build.lib}/loading.sar">
<metainf dir="${source.resources}/classloader/resource">
<include name="jboss-service.xml" />
</metainf>
@@ -3584,9 +3584,57 @@
<include name="dtds/*" />
</fileset>
<fileset dir="${build.lib}">
- <include name="loadingresource.sar" />
+ <include name="loading.sar" />
</fileset>
</ear>
+
+ <!-- Create unpacked loadingresource1 ear -->
+ <property name="ear1.dist"
+ value="${build.lib}/unpacked/loadingresource1.ear" />
+ <mkdir dir="${ear1.dist}/META-INF" />
+ <copy todir="${ear1.dist}/META-INF">
+ <fileset dir="${build.resources}/classloader/resource">
+ <include name="application.xml" />
+ <include name="jboss-app.xml" />
+ </fileset>
+ </copy>
+ <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"
+ tofile="${ear1.dist}/loading.sar/META-INF/jboss-service.xml"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="1"/>
+ </filterset>
+ </copy>
+ <copy file="${build.resources}/classloader/resource/dtds/sampleX.dtd"
+ tofile="${ear1.dist}/dtds/sample1.dtd" />
+ <!-- Create unpacked loadingresource2 ear -->
+ <property name="ear2.dist"
+ value="${build.lib}/unpacked/loadingresource2.ear" />
+ <mkdir dir="${ear2.dist}/META-INF" />
+ <copy todir="${ear2.dist}/META-INF">
+ <fileset dir="${build.resources}/classloader/resource">
+ <include name="application.xml" />
+ <include name="jboss-app.xml" />
+ </fileset>
+ </copy>
+ <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"
+ tofile="${ear2.dist}/loading.tmp/META-INF/jboss-service.xml"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="2"/>
+ </filterset>
+ </copy>
+ <copy todir="${ear2.dist}//loading.tmp/dtds">
+ <fileset dir="${build.resources}/classloader/resource/dtds" />
+ </copy>
+ <copy file="${build.resources}/classloader/resource/dtds/sampleX.dtd"
+ tofile="${ear2.dist}/loading.tmp/dtds/sample2.dtd" />
+ <zip destfile="${ear2.dist}/loading.sar" basedir="${ear2.dist}/loading.tmp"/>
+ <delete dir="${ear2.dist}/loading.tmp" />
<!-- Build version 1 of the singleton.jar -->
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
|