[jboss-cvs] JBossAS SVN: r60484 - branches/Branch_4_2/testsuite/imports/sections.

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

Author: scott.stark at jboss.org
Date: 2007-02-12 02:50:56 -0500 (Mon, 12 Feb 2007)
New Revision: 60484

Modified:
   branches/Branch_4_2/testsuite/imports/sections/classloader.xml
Log:
JBAS-2823, update the commons logging override test to include a version that bundles the commons-logging.jar

Modified: branches/Branch_4_2/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/classloader.xml	2007-02-12 06:52:34 UTC (rev 60483)
+++ branches/Branch_4_2/testsuite/imports/sections/classloader.xml	2007-02-12 07:50:56 UTC (rev 60484)
@@ -317,7 +317,7 @@
          reinitialized in the context of the war to find the war log4j.xml.
          -->
         <lib dir="${apache.log4j.lib}">
-          <include name="*.jar" />
+          <include name="log4j.jar" />
         </lib>
         <classes dir="${build.classes}">
           <include
@@ -330,6 +330,38 @@
         </classes>
      </war>
 
+  	<!-- Similar to commons-logging.war but includes the current commons-logging.jar
+  	in the war WEB-INF/lib
+  	-->
+   <war destfile="${build.lib}/cl11-withjar.war"
+      webxml="${build.resources}/classloader/scoping/override/common-logging/web.xml">
+      <webinf
+         dir="${build.resources}/classloader/scoping/override/common-logging">
+         <include name="jboss-web.xml"/>
+      </webinf>
+      <!-- Need to include log4j.jar to allow the singleton config to be
+       reinitialized in the context of the war to find the war log4j.xml.
+       -->
+      <lib dir="${apache.log4j.lib}">
+        <include name="log4j.jar" />
+      </lib>
+      <lib dir="${apache.logging.lib}">
+        <include name="commons-logging.jar" />
+      </lib>
+      <classes dir="${build.classes}">
+        <include
+           name="org/jboss/test/classloader/scoping/override/web/comlog/*"/>
+      </classes>
+      <classes
+         dir="${build.resources}/classloader/scoping/override/common-logging">
+        <include name="commons-logging.properties"/>
+      </classes>
+   	<zipfileset dir="${build.resources}/classloader/scoping/override/common-logging"
+   		fullpath="WEB-INF/classes/log4j.xml">
+         <include name="log4j-cl11.xml"/>
+   	</zipfileset>
+   </war>
+
       <war destfile="${build.lib}/oldxerces.war"
       webxml="${build.resources}/classloader/scoping/override/xml/web.xml">
       <webinf dir="${build.resources}/classloader/scoping/override/xml">