[jboss-svn-commits] JBL Code SVN: r23565 - in labs/jbossesb/branches/JBESB_4_4_GA_CP: product/install/standalone and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2008-10-23 12:30:16 -0400 (Thu, 23 Oct 2008)
New Revision: 23565

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/esb-config.xml
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/standalone/jbossesb-server-base.zip
   labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java
Log:
Support JBossWS on JDK6: JBESB-2144

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/esb-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/esb-config.xml	2008-10-23 14:01:21 UTC (rev 23564)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/esb-config.xml	2008-10-23 16:30:16 UTC (rev 23565)
@@ -51,6 +51,7 @@
                 dir="@{serverHome}/bin">
                 <classpath refid="server.classpath"/>
                 <jvmarg line="${agent.jvmarg}"/>
+                <jvmarg line="-Djava.endorsed.dirs=${server.endorsed}"/>
                 <arg value="-c"/>
                 <arg value="@{serverConfig}"/>
             	<serverElements/>
@@ -188,6 +189,7 @@
         	<pathelement location="${java.home}/lib/tools.jar"/>
             <pathelement location="${org.jboss.esb.server.home}/bin/run.jar"/>
         </path>
+    	<property name="server.endorsed" location="${org.jboss.esb.server.home}/lib/endorsed"/>
     </target>
 
 	<target name="esb.configure" depends="esb.init, esb.configure-app-server, esb.configure-esb-server, esb.configure-ftp-server"/>

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/install/standalone/jbossesb-server-base.zip
===================================================================
(Binary files differ)

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java	2008-10-23 14:01:21 UTC (rev 23564)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java	2008-10-23 16:30:16 UTC (rev 23565)
@@ -119,21 +119,21 @@
      * Test for normal valid response through SOAP.
      * @throws Exception for any failures.
      */
-//    public void testNormalSoapRequest()
-//        throws Exception
-//    {
-//        runSoapRequestTest(EBWSUtil.NORMAL_SOAP_ENDPOINT) ;
-//    }
+    public void testNormalSoapRequest()
+        throws Exception
+    {
+        runSoapRequestTest(EBWSUtil.NORMAL_SOAP_ENDPOINT) ;
+    }
     
     /**
      * Test for alternate valid response through SOAP.
      * @throws Exception for any failures.
      */
-//    public void testAlternateSoapRequest()
-//        throws Exception
-//    {
-//        runSoapRequestTest(EBWSUtil.ALTERNATE_SOAP_ENDPOINT) ;
-//    }
+    public void testAlternateSoapRequest()
+        throws Exception
+    {
+        runSoapRequestTest(EBWSUtil.ALTERNATE_SOAP_ENDPOINT) ;
+    }
     
     private void runRequestResponseTest(final String requestLocation, final String responseLocation, final String name)
         throws Exception