[jboss-svn-commits] JBL Code SVN: r17814 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts: webservice_mtom and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 14 08:57:19 EST 2008
Author: kevin.conner at jboss.com
Date: 2008-01-14 08:57:18 -0500 (Mon, 14 Jan 2008)
New Revision: 17814
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/README.html
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/README.html
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/README.html
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml
Log:
Fix remoting version and webservice compilation/classpath: JBESB-1454, JBESB-1478
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml 2008-01-14 13:57:18 UTC (rev 17814)
@@ -150,10 +150,12 @@
<!-- soap config -->
<fileset dir="${org.jboss.esb.server.server}/deploy/soap.esb" includes="*.jar"/>
<pathelement location="${org.jboss.esb.server.server}/deploy/soap.esb"/>
+ <fileset dir="${org.jboss.esb.server.server}/lib" includes="activation.jar, mail.jar, jboss-ejb3x.jar"/>
<!-- general libs -->
<pathelement location="${org.jboss.esb.server.home}/lib/commons-logging.jar"/>
<pathelement location="${org.jboss.esb.server.home}/lib/commons-codec.jar"/>
<pathelement location="${org.jboss.esb.server.home}/lib/jboss-system.jar"/>
+ <pathelement location="${org.jboss.esb.server.home}/lib/jboss-xml-binding.jar"/>
</path>
</target>
@@ -479,19 +481,21 @@
<fail unless="quickstart.ftp.config" message="Please configure ftp properties in quickstart.properties"/>
</target>
- <target name="assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="assert-jbossremoting-version">
<java fork="yes" classname="org.jboss.remoting.Version" failonerror="true" outputproperty="jbr-version-string">
<classpath refid="exec-classpath"/>
</java>
<echo message="JBR Version String: '${jbr-version-string}'."/>
<condition property="is-valid-jbr-version">
- <or>
- <contains string="${jbr-version-string}" substring="2.2.2.SP1" />
- <contains string="${jbr-version-string}" substring="2.2.2.SP2" />
- </or>
+ <and>
+ <contains string="${jbr-version-string}" substring="2.2.2.SP" />
+ <not>
+ <contains string="${jbr-version-string}" substring="2.2.2.SP1 " />
+ </not>
+ </and>
</condition>
- <fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server. Please install version 2.2.2.SP2: http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar" />
+ <fail unless="is-valid-jbr-version" message="Invalid version of JBossRemoting installed on target server. Please install version 2.2.2.SP2 or higher: http://repository.jboss.org/jboss/remoting/" />
</target>
<!-- ==================================================================== -->
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/README.html
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/README.html 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/README.html 2008-01-14 13:57:18 UTC (rev 17814)
@@ -19,7 +19,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml 2008-01-14 13:57:18 UTC (rev 17814)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
@@ -27,7 +27,6 @@
</war>
</target>
-
<target name="runtest" depends="compile" description="runs test JMS Sender">
<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.webservicemtom.webservice.client.MTOMClient"
failonerror="true">
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/src/org/jboss/soa/esb/samples/quickstart/webservicemtom/webservice/MTOMProtocolHandler.java 2008-01-14 13:57:18 UTC (rev 17814)
@@ -22,7 +22,7 @@
package org.jboss.soa.esb.samples.quickstart.webservicemtom.webservice;
import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/README.html
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/README.html 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/README.html 2008-01-14 13:57:18 UTC (rev 17814)
@@ -24,7 +24,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-01-14 13:57:18 UTC (rev 17814)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/ServerHandler.java 2008-01-14 13:57:18 UTC (rev 17814)
@@ -34,8 +34,8 @@
import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
-import org.jboss.wsf.spi.utils.DOMUtils;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
/**
* A server side handler for the ws-addressing
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/src/org/jboss/soa/esb/samples/quickstart/webservicewsa/client/ClientHandler.java 2008-01-14 13:57:18 UTC (rev 17814)
@@ -36,9 +36,9 @@
import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
import org.jboss.ws.core.utils.UUIDGenerator;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
-import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.soa.esb.samples.quickstart.webservicewsa.StatefulEndpointImpl;
/**
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/README.html
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/README.html 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/README.html 2008-01-14 13:57:18 UTC (rev 17814)
@@ -19,7 +19,7 @@
JBoss AS 4.2.1.GA. Installation instructions for both can be found in the
install/readme.txt.
<p/>
- <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 patch to be applied.
+ <b style="text-decoration: blink; color: red">NOTE:</b> This Quickstart requires the JBossRemoting 2.2.2SP2 or higher patch to be applied.
This simply involves downloading <a href="http://repository.jboss.org/jboss/remoting/2.2.2.SP2/lib/jboss-remoting.jar">jboss-remoting.jar</a>
and copying it into your "server/<server>/lib" folder. Be sure to restart your JBoss
Application/ESB Server instance.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-01-14 13:36:51 UTC (rev 17813)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-01-14 13:57:18 UTC (rev 17814)
@@ -8,7 +8,7 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-2.2.2.SP1-plus">
+ <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar"/>
</path>
More information about the jboss-svn-commits
mailing list