[Jboss-cvs] JBossAS SVN: r56972 - in branches/MC_VDF_WORK/system-jmx: . src/resources/tests/org/jboss/test src/resources/tests/org/jboss/test/classloading src/tests/org/jboss/test/classloading
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 19 10:31:37 EDT 2006
Author: adrian at jboss.org
Date: 2006-09-19 10:31:29 -0400 (Tue, 19 Sep 2006)
New Revision: 56972
Added:
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar1.jar
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2.jar
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2CPjar1.jar
branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar3.jar
Modified:
branches/MC_VDF_WORK/system-jmx/.classpath
branches/MC_VDF_WORK/system-jmx/build-support-jars.xml
branches/MC_VDF_WORK/system-jmx/build-test.xml
branches/MC_VDF_WORK/system-jmx/build.xml
branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/classloading/UCLDomainClassLoaderTest.java
Log:
Remove the need to build test-lib.
The jars are now in src/resources and output/resources.
If there is any need to change them, they can be rebuilt
with build.sh -f build-test.xml tests-support and committing
the changed jars.
Modified: branches/MC_VDF_WORK/system-jmx/.classpath
===================================================================
--- branches/MC_VDF_WORK/system-jmx/.classpath 2006-09-19 13:57:56 UTC (rev 56971)
+++ branches/MC_VDF_WORK/system-jmx/.classpath 2006-09-19 14:31:29 UTC (rev 56972)
@@ -23,7 +23,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
- <classpathentry kind="lib" path="output/test-lib"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-2.0.0.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
Modified: branches/MC_VDF_WORK/system-jmx/build-support-jars.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-support-jars.xml 2006-09-19 13:57:56 UTC (rev 56971)
+++ branches/MC_VDF_WORK/system-jmx/build-support-jars.xml 2006-09-19 14:31:29 UTC (rev 56972)
@@ -1,7 +1,7 @@
<project name="tests-support-jars" default="jars">
<property name="build.test" value="output/classes-tests-support" />
- <property name="build.test.lib" value="output/test-lib" />
+ <property name="build.test.lib" value="src/resources/org/jboss/test/classloading" />
<target name="jars" description="Build the tests-support tree jars"
depends="jar1, jar2CPjar1, jar2, jar3" />
Modified: branches/MC_VDF_WORK/system-jmx/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-09-19 13:57:56 UTC (rev 56971)
+++ branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-09-19 14:31:29 UTC (rev 56972)
@@ -173,7 +173,7 @@
<!-- Archives -->
<!-- ================================================================== -->
- <target name="module-jars" depends="tests-support-jars">
+ <target name="module-jars">
<!-- Build jboss-system-jmx-test.jar -->
<jar jarfile="${build.lib}/jboss-system-jmx-test.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
@@ -183,8 +183,9 @@
</jar>
</target>
<!-- Jars built from the independent src/tests-support,output/tests-support-classes trees -->
- <target name="tests-support-jars" depends="init">
- <ant antfile="build-support-jars.xml" inheritAll="true" dir="." />
+ <target name="tests-support-jars" depends="compile-tests-support">
+ <ant antfile="build-support-jars.xml" inheritAll="true" dir="." />
+ <call target="_default:compile-resources"/>
</target>
<!-- ================================================================== -->
Modified: branches/MC_VDF_WORK/system-jmx/build.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build.xml 2006-09-19 13:57:56 UTC (rev 56971)
+++ branches/MC_VDF_WORK/system-jmx/build.xml 2006-09-19 14:31:29 UTC (rev 56972)
@@ -113,6 +113,15 @@
**/*MBean.class"
/>
+ <patternset id="compile-resources.filter.pattern">
+ <include name="**/*"/>
+ <exclude name="tests/**"/>
+ </patternset>
+
+ <patternset id="compile-resources.pattern">
+ <include name="tests/**"/>
+ </patternset>
+
<call target="_default:task-init"/>
</target>
Added: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar1.jar
===================================================================
(Binary files differ)
Property changes on: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2.jar
===================================================================
(Binary files differ)
Property changes on: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2CPjar1.jar
===================================================================
(Binary files differ)
Property changes on: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar2CPjar1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar3.jar
===================================================================
(Binary files differ)
Property changes on: branches/MC_VDF_WORK/system-jmx/src/resources/tests/org/jboss/test/classloading/jar3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/classloading/UCLDomainClassLoaderTest.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/classloading/UCLDomainClassLoaderTest.java 2006-09-19 13:57:56 UTC (rev 56971)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/classloading/UCLDomainClassLoaderTest.java 2006-09-19 14:31:29 UTC (rev 56972)
@@ -137,7 +137,7 @@
assertSame(loader, bean.getClass().getClassLoader());
Class beanClass2 = repository.loadClass("org.jboss.test.support.jar1.simple1.ISimpleBean");
- assertNotNull(beanClass);
+ assertNotNull(beanClass2);
pd = beanClass2.getProtectionDomain();
getLog().info(beanClass2+", PD: "+pd);
path = pd.getCodeSource().getLocation().getPath();
@@ -335,7 +335,7 @@
for(String jar : jars)
{
// This needs to use the fully pathname syntax
- URL jarURL = super.getResource(jar);
+ URL jarURL = super.getResource("/org/jboss/test/classloading/" + jar);
if( jarURL == null )
fail("Failed to find resource for jar: "+jar);
cp.add(jarURL);
More information about the jboss-cvs-commits
mailing list