[jboss-svn-commits] JBL Code SVN: r21680 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product: lib/ext/endorsed and 1 other directories.

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

Author: beve
Date: 2008-08-22 04:42:00 -0400 (Fri, 22 Aug 2008)
New Revision: 21680

Added:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/lib/ext/endorsed/
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/lib/ext/endorsed/jboss-saaj.jar
Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/build.xml
Log:
Added lib/endorsed/jboss-saaj.jar to fix Java1.6 build.


Added: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/lib/ext/endorsed/jboss-saaj.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/lib/ext/endorsed/jboss-saaj.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/build.xml	2008-08-22 08:05:25 UTC (rev 21679)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/build.xml	2008-08-22 08:42:00 UTC (rev 21680)
@@ -90,11 +90,19 @@
 			</report>
 	    </emma>
     </target>
+	
+	<target name="create.endorsed.property">
+		<condition property="endorsed" else="${java.endorsed.dirs}" value="${java.endorsed.dirs}${path.separator}${org.jboss.esb.ext.lib.dir}/endorsed">
+    		<equals arg1="${java.specification.version}" arg2="1.6"/>
+		</condition>
+		<echo message="Setting java.endorsed.dir=${endorsed}"/>
+		<property name="java.endorsed.dirs" value="${endorsed}"/>
+	</target>	
 
     <!-- ====================================================================== -->
     <!--         U N I T   A N D   F U N C T I O N A L   T E S T S              -->
     <!-- ====================================================================== -->
-    <target name="org.jboss.esb.services.internal.test.exec">
+    <target name="org.jboss.esb.services.internal.test.exec" depends="create.endorsed.property">
         <echo message="Running tests '${tests.to.run}' for Rosetta module, excluding integration"/>
 
         <delete dir="${org.jboss.esb.test.persistdb.dir}" failonerror="false"/>
@@ -106,6 +114,7 @@
             <fileset dir="${org.jboss.esb.module.tests.src.dir}" includes="**/*.xml" />
         </copy>
 		<copy file="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.1.xsd" todir="${org.jboss.esb.tests.classes.dir}"/>
+    	
 
 
     	<junit printsummary="yes" haltonerror="${org.jboss.esb.build.haltonerror}" haltonfailure="${org.jboss.esb.build.haltonfailure}" showoutput="no" fork="true">
@@ -146,6 +155,11 @@
             <sysproperty key="org.jboss.esb.test.persistdb.dir" value="${org.jboss.esb.test.persistdb.dir}"/>
         	<sysproperty key="log4j.configuration" value="log4j.xml"/>
             <sysproperty key="jboss.esb.invm.scope.default" value="NONE"/>
+			<!--	
+					Setting the endored lib to lib/ext/endorsed 
+					This was needed for Java6 as it distributes it's one version of saaj	
+			-->
+            <sysproperty key="java.endorsed.dirs" value="${endorsed}"/>
         </junit>
         <junitreport>
             <fileset dir="${org.jboss.esb.tests.report.dir}">