[Jboss-cvs] JBossAS SVN: r56432 - in branches/MC_VDF_WORK/system-jmx: . src/tests-support/org/jboss/test/support src/tests-support/org/jboss/test/support/jar2

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-08-30 03:55:15 -0400 (Wed, 30 Aug 2006)
New Revision: 56432

Added:
   branches/MC_VDF_WORK/system-jmx/src/tests-support/org/jboss/test/support/jar2/
   branches/MC_VDF_WORK/system-jmx/src/tests-support/org/jboss/test/support/jar2/Jar1Consumer.java
Modified:
   branches/MC_VDF_WORK/system-jmx/build-support-jars.xml
Log:
Expand the class loader tests

Modified: branches/MC_VDF_WORK/system-jmx/build-support-jars.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-support-jars.xml	2006-08-30 07:53:38 UTC (rev 56431)
+++ branches/MC_VDF_WORK/system-jmx/build-support-jars.xml	2006-08-30 07:55:15 UTC (rev 56432)
@@ -4,21 +4,35 @@
    <property name="build.test.lib" value="output/test-lib" />
 
     <target name="jars" description="Build the tests-support tree jars"
-        depends="jar1.jar" />
+        depends="jar1, jar2CPjar1, jar2, jar3" />
 
     <macrodef name="build-test-jar" description="build a jar from a name patter">
         <attribute name="name" description="Basename for jar/package" />
+        <attribute name="package" default="@{name" description="Basename for package" />
+        <attribute name="classpath" default="" description="Class-Path manifest value" />
         <sequential>
             <mkdir dir="${build.test.lib}" />
             <jar destfile="${build.test.lib}/@{name}.jar">
+                <manifest>
+                  <attribute name="Class-Path" value="@{classpath}" />
+                </manifest>
                 <fileset dir="${build.test}">
-                    <include name="org/jboss/test/support/@{name}/**"/>
+                    <include name="org/jboss/test/support/@{package}/**"/>
                 </fileset>
             </jar>
         </sequential>
     </macrodef>
 
-    <target name="jar1.jar">
+    <target name="jar1">
         <build-test-jar name="jar1" />
     </target>
+    <target name="jar2CPjar1">
+        <build-test-jar name="jar2CPjar1" package="jar2" classpath="jar1.jar" />
+    </target>
+    <target name="jar2">
+        <build-test-jar name="jar2" />
+    </target>
+    <target name="jar3">
+        <build-test-jar name="jar3" />
+    </target>
 </project>
\ No newline at end of file

Added: branches/MC_VDF_WORK/system-jmx/src/tests-support/org/jboss/test/support/jar2/Jar1Consumer.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests-support/org/jboss/test/support/jar2/Jar1Consumer.java	2006-08-30 07:53:38 UTC (rev 56431)
+++ branches/MC_VDF_WORK/system-jmx/src/tests-support/org/jboss/test/support/jar2/Jar1Consumer.java	2006-08-30 07:55:15 UTC (rev 56432)
@@ -0,0 +1,22 @@
+package org.jboss.test.support.jar2;
+
+import org.jboss.test.support.jar1.simple1.ISimpleBean;
+
+public class Jar1Consumer
+{
+   ISimpleBean bean;
+
+   public Jar1Consumer()
+   {
+      
+   }
+
+   public ISimpleBean getBean()
+   {
+      return bean;
+   }
+   public void setBean(ISimpleBean bean)
+   {
+      this.bean = bean;
+   }
+}