[jboss-svn-commits] JBL Code SVN: r26756 - labs/jbossesb/workspace/dbevenius/jbossas5/product.

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

Author: beve
Date: 2009-05-28 03:34:31 -0400 (Thu, 28 May 2009)
New Revision: 26756

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
Log:
Attempting to fix build for Java 6. 


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml	2009-05-28 04:07:24 UTC (rev 26755)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml	2009-05-28 07:34:31 UTC (rev 26756)
@@ -47,6 +47,7 @@
     	<element name="serverElements" implicit="yes" optional="true"/>
         <sequential>
 	    	<echo message="Starting local ESB server"/>
+	    	<echo message="java.endorsed.dirs : ${server.endorsed}"/>
             <java classname="org.jboss.Main" fork="true" spawn="true"
                 dir="@{serverHome}/bin">
                 <classpath refid="server.classpath"/>
@@ -145,6 +146,17 @@
     	
         <fail unless="org.jboss.soa.esb.qa.jmsprovider" message="Could not determine server messaging subsystem"/>
     	<property name="org.jboss.esb.server.config.appserver" value="true"/>
+    	
+    	<!-- Check for JBossAS5 -->
+        <condition property="jbossas5">
+            <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deployers"/>
+        </condition>
+        <!-- Check for JBossAS4.x -->
+        <condition property="jbossas4">
+            <not>
+                <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deployers"/>
+            </not>
+        </condition>
 	</target>
 	
 	<target name="esb.configure-app-server" unless="soa.test.no-prepare" if="org.jboss.esb.server.config.appserver">
@@ -196,7 +208,19 @@
             <pathelement location="${org.jboss.esb.server.home}/bin/run.jar"/>
         </path>
     	<property name="server.endorsed" location="${org.jboss.esb.server.home}/lib/endorsed"/>
+		<antcall target="copy-ws-libs-to-endorsed"/>
     </target>
+    
+	<target name="copy-ws-libs-to-endorsed" if="jbossas5">
+		<copy todir="${server.endorsed}">
+			<fileset dir="${org.jboss.esb.server.home}/common/lib">
+                <include name="jbossws-native-jaxws.jar"/>
+                <include name="jbossws-native-jaxws-ext.jar"/>
+                <include name="jbossws-native-jaxrpc.jar"/>
+                <include name="jbossws-native-saaj.jar"/>
+			</fileset>
+		</copy>
+    </target>
 
 	<target name="esb.configure" depends="esb.init, esb.configure-app-server, esb.configure-esb-server, esb.configure-ftp-server"/>