June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3519 - branches/jbossws-2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-09 05:30:54 -0400 (Sat, 09 Jun 2007) New Revision: 3519 Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml Log: Use jaxb-api.jar from lib/endorsed Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 09:24:31 UTC (rev 3518) +++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 09:30:54 UTC (rev 3519) @@ -136,8 +136,8 @@ <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> + <pathelement location="${jboss.lib}/endorsed/jaxb-api.jar"/> <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-client.jar"/>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3518 - in branches/jbossws-2.0: integration/spi/ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-09 05:24:31 -0400 (Sat, 09 Jun 2007) New Revision: 3518 Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml branches/jbossws-2.0/jbossws-core/build.xml Log: Fix script/resources deployment Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:03:28 UTC (rev 3517) +++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:24:31 UTC (rev 3518) @@ -110,9 +110,9 @@ <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-resources.zip"/> + <include name="jbossws-core-scripts.zip"/> </fileset> <fileset dir="${int.native.dir}/output/lib"> <include name="jbossws-context.war"/> Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:03:28 UTC (rev 3517) +++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:24:31 UTC (rev 3518) @@ -31,7 +31,6 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" - spiscripts="${spi.dir}/etc" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss50.home}"/> </target> @@ -53,7 +52,6 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" - spiscripts="${spi.dir}/etc" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss42.home}"/> </target> @@ -77,7 +75,6 @@ <macro-deploy-spi spilibs="${spi.dir}/output/lib" - spiscripts="${spi.dir}/etc" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss40.home}"/> </target> Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:03:28 UTC (rev 3517) +++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:24:31 UTC (rev 3518) @@ -26,9 +26,8 @@ <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> -  - <unzip dest="${jboss50.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> - <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> +  + <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/> <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>  @@ -86,7 +85,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <delete> -  +  <fileset dir="${jboss50.home}/bin"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> @@ -148,9 +147,8 @@ </fileset> </copy> -  - <unzip dest="${jboss42.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> - <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> +  + <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/> <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>  @@ -196,7 +194,7 @@ <include name="jaxb-api.jar"/> </fileset> -  +  <fileset dir="${jboss42.home}/bin"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> @@ -251,9 +249,8 @@ <sequential> <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> -  - <unzip dest="${jboss40.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> - <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> +  + <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/> <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>  @@ -320,7 +317,7 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <delete> -  +  <fileset dir="${jboss40.home}/bin"> <include name="wsconsume.*"/> <include name="wsprovide.*"/> Modified: branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-09 09:03:28 UTC (rev 3517) +++ branches/jbossws-2.0/integration/spi/ant-import/macros-deploy-spi.xml 2007-06-09 09:24:31 UTC (rev 3518) @@ -15,29 +15,27 @@ <macrodef name="macro-deploy-spi"> <attribute name="spilibs"/> - <attribute name="spiscripts"/> <attribute name="thirdpartylibs"/> <attribute name="jbosshome"/> <sequential> + +  + <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + +  <copy todir="@{jbosshome}/client"> <fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> </fileset> </copy> + +  <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> <fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> </fileset> </copy> - <copy todir="@{jbosshome}/bin" overwrite="true"> - <fileset dir="@{spiscripts}"> - <include name="wsconsume.bat"/> - <include name="wsconsume.sh"/> - <include name="wsprovide.bat"/> - <include name="wsprovide.sh"/> - </fileset> - </copy> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> </sequential> </macrodef> @@ -45,18 +43,21 @@ <attribute name="jbosshome"/> <sequential> <delete> +  + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + +  <fileset dir="@{jbosshome}/client"> <include name="jbossws-spi.jar"/> </fileset> + +  <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> <include name="jbossws-spi.jar"/> </fileset> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.bat"/> - <include name="wsconsume.sh"/> - <include name="wsprovide.bat"/> - <include name="wsprovide.sh"/> - </fileset> </delete> </sequential> </macrodef> Modified: branches/jbossws-2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:03:28 UTC (rev 3517) +++ branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:24:31 UTC (rev 3518) @@ -172,11 +172,8 @@ </metainf> </jar> -  - <zip zipfile="${core.output.lib.dir}/jbossws-resources.zip" > - <fileset dir="${core.resources.dir}/standard-config"> - <include name="standard-*-config.xml"/> - </fileset> +  + <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > <fileset dir="${core.output.etc.dir}"> <include name="wsrunclient.bat"/> <include name="wstools.bat"/>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3517 - in branches/jbossws-2.0: integration/spi and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-09 05:03:28 -0400 (Sat, 09 Jun 2007) New Revision: 3517 Added: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh Removed: branches/jbossws-2.0/integration/spi/etc/ branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml branches/jbossws-2.0/integration/spi/build.xml branches/jbossws-2.0/jbossws-core/build.xml Log: Fix script/resources deployment Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -92,6 +92,7 @@ <copy todir="${bindist.lib.dir}" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> + <include name="jbossws-spi-scripts.zip"/> </fileset> <fileset dir="${spi.dir}/thirdparty"> <include name="getopt.jar"/> @@ -111,6 +112,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-core.jar"/> <include name="jbossws-client.jar"/> + <include name="jbossws-resources.zip"/> </fileset> <fileset dir="${int.native.dir}/output/lib"> <include name="jbossws-context.war"/> Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -27,8 +27,7 @@ jbosslibs="${int.jboss50.dir}/output/lib" corelibs="${core.dir}/output/lib" stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty" - corescripts="${core.dir}/src/main/etc"/> + thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-spi spilibs="${spi.dir}/output/lib" @@ -74,8 +73,7 @@ jbosslibs="${int.jboss40.dir}/output/lib" corelibs="${core.dir}/output/lib" stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty" - corescripts="${core.dir}/src/main/etc"/> + thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-spi spilibs="${spi.dir}/output/lib" Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -23,10 +23,14 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> +  + <unzip dest="${jboss50.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> + <unzip dest="${jboss50.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> + <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> +  <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -66,33 +70,30 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> - + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/> -  <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> </sequential> </macrodef> <macrodef name="macro-undeploy-native50"> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <delete> - +  + <fileset dir="${jboss50.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> +  <fileset dir="${jboss50.home}/client"> <include name="jaxb-api.jar"/> @@ -122,17 +123,7 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> -  <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <delete> - <fileset dir="${jboss50.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> @@ -142,7 +133,6 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> @@ -158,6 +148,11 @@ </fileset> </copy> +  + <unzip dest="${jboss42.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> + <unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> + <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> +  <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -185,20 +180,9 @@ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> -  <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <copy todir="${jboss42.home}bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> - + </sequential> </macrodef> @@ -212,6 +196,14 @@ <include name="jaxb-api.jar"/> </fileset> +  + <fileset dir="${jboss42.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> +  <fileset dir="${jboss42.home}/client"> <include name="jaxb-api.jar"/> @@ -246,17 +238,7 @@ </fileset> </delete> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> -  <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <delete> - <fileset dir="${jboss42.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> @@ -266,10 +248,14 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> +  + <unzip dest="${jboss40.home}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/> + <unzip dest="${jboss40.home}/bin" src="@{corelibs}/jbossws-resources.zip"/> + <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> +  <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -307,20 +293,9 @@ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> -  <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> - + </sequential> </macrodef> @@ -345,6 +320,14 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <delete> +  + <fileset dir="${jboss40.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> +  <fileset dir="${jboss40.home}/client"> <include name="jaxb-api.jar"/> @@ -378,19 +361,9 @@ </fileset> </delete> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> -  <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>  <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <delete> - <fileset dir="${jboss40.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> Modified: branches/jbossws-2.0/integration/spi/build.xml =================================================================== --- branches/jbossws-2.0/integration/spi/build.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/spi/build.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -71,9 +71,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${spi.output.etc.dir}"/> <copy todir="${spi.output.etc.dir}" filtering="yes"> - <fileset dir="${spi.etc.dir}"> - <include name="component-info.xml"/> - </fileset> + <fileset dir="${spi.etc.dir}"/> <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> @@ -111,15 +109,23 @@ </fileset> </jar> -  +  + <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" > + <fileset dir="${spi.output.etc.dir}"> + <include name="wsconsume.bat"/> + <include name="wsprovide.bat"/> + </fileset> + <zipfileset dir="${spi.output.etc.dir}" filemode="755"> + <include name="wsconsume.sh"/> + <include name="wsprovide.sh"/> + </zipfileset> + </zip> + +  <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > <fileset dir="${spi.java.dir}"/> </zip> -  - <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" > - <fileset dir="${spi.dir}/etc"/> - </zip> </target>  Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsconsume.bat) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,55 @@ +@echo off + +rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +set JAVA=%JAVA_HOME%\bin\java +set JBOSS_HOME=%DIRNAME%\.. +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +rem Setup the wstools classpath +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsconsume.sh) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,127 @@ +#!/bin/sh + +# +# Invoke wsconsume with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +### +# Setup the LIBDIR +# This script maybe used form within the jbossws distribution +# or installed under JBOSS_HOME/bin +### + +PARENT=`cd $DIRNAME/..; pwd` +if [ -d $PARENT/client ]; then + LIBDIR=$JBOSS_HOME/client +else + LIBDIR=$PARENT/lib +fi + +# Is it a JBossWS-native or SunRI installation? +if [ -a $LIBDIR/jbossws-client.jar ]; then + JBOSSWS_NATIVE="true" +fi + +### +# Setup the wsconsume classpath +# The classpath is dynamically build depending on the stack that +# is deployed. See $JBOSSWS_NATIVE above. +### + +# shared libs +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/activation.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/getopt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossall-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/log4j.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/mail.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar" + +# shared jaxws libs +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar" + +# stack specific dependencies +if [ "x$JBOSSWS_NATIVE" = "x" ]; then + echo "Seems to be a Sun-RI stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" +else + echo "Seems to be a JBossWS-Native stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar" +fi + +### +# Execute the JVM +### + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSCONSUME_CLASSPATH" \ + org.jboss.wsf.spi.tools.cmd.WSConsume "$@" Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsprovide.bat) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,49 @@ +@echo off + +rem $Id: wsprovide.bat 3101 2007-05-16 08:26:33Z heiko.braun(a)jboss.com $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +set JAVA=%JAVA_HOME%\bin\java +set JBOSS_HOME=%DIRNAME%\.. +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +rem Setup the wstools classpath +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsprovide.sh) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,134 @@ +#!/bin/sh + +# +# Invoke wsprovide with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +### +# Setup the LIBDIR +# This script maybe used form within the jbossws distribution +# or installed under JBOSS_HOME/bin +### + +PARENT=`cd $DIRNAME/..; pwd` +if [ -d $PARENT/client ]; then + LIBDIR=$JBOSS_HOME/client +else + LIBDIR=$PARENT/lib +fi + +# is it a JBossWS-native or SunRI installation? +if [ -a $LIBDIR/jbossws-client.jar ]; then + JBOSSWS_NATIVE="true" +fi + +### +# Setup the wsprovide classpath +# The classpath is dynamically build depending on the stack that +# is deployed. See $JBOSSWS_NATIVE above. +### + +# shared libs +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar" + +# TODO: verify jbossall-client.jar dependency. It might be just logging +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar" + +# shared jaxws libs +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar" + +# stack specific dependencies +if [ "x$JBOSSWS_NATIVE" = "x" ]; then + echo "Seems to be a Sun-RI stack deployed" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar" +else + echo "Seems to be a JBossWS-Native stack deployed" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" +fi + +### +# Execute the JVM +### + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSPROVIDE_CLASSPATH" \ + org.jboss.wsf.spi.tools.cmd.WSProvide "$@" Modified: branches/jbossws-2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/build.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -178,20 +178,16 @@ <include name="standard-*-config.xml"/> </fileset> <fileset dir="${core.output.etc.dir}"> - <include name="wsprovide.bat"/> - <include name="wsconsume.bat"/> <include name="wsrunclient.bat"/> <include name="wstools.bat"/> </fileset> <zipfileset dir="${core.output.etc.dir}" filemode="755"> - <include name="wsprovide.sh"/> - <include name="wsconsume.sh"/> <include name="wsrunclient.sh"/> <include name="wstools.sh"/> </zipfileset> </zip> -  +  <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > <fileset dir="${core.java.dir}"/> </zip> Deleted: branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -1,73 +0,0 @@ -#!/bin/sh - -# $Id: wspublish.sh 2157 2007-01-27 06:03:58Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$TOMCAT_HOME" ] && - TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi -export TOMCAT_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the WSPUBLISH classpath -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSPUBLISH Environment" -echo "" -echo " TOMCAT_HOME: $TOMCAT_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSPUBLISH_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -classpath "$WSPUBLISH_CLASSPATH" \ - org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@" -

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3516 - in branches/jbossws-2.0: integration/spi/src/main/java/org/jboss/wsf/spi/deployment and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 15:55:32 -0400 (Fri, 08 Jun 2007) New Revision: 3516 Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java Log: Add legacy context/url-pattern deployer Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-08 19:17:32 UTC (rev 3515) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-08 19:55:32 UTC (rev 3516) @@ -135,7 +135,7 @@ Each handles a single aspect of web service deployment --> <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/> - <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> + <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> @@ -161,7 +161,7 @@ <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> - <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.LegacyURLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-06-08 19:17:32 UTC (rev 3515) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-06-08 19:55:32 UTC (rev 3516) @@ -38,11 +38,18 @@ @Override public void create(Deployment dep) { - String contextRoot = getContextRoot(dep); + String contextRoot = getExplicitContextRoot(dep); + if (contextRoot == null) + contextRoot = getImplicitContextRoot(dep); + + // Always prefix with '/' + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; + dep.getService().setContextRoot(contextRoot); } - private String getContextRoot(Deployment dep) + protected String getExplicitContextRoot(Deployment dep) { String contextRoot = null; @@ -75,23 +82,21 @@ contextRoot = appMetaData.getWebServiceContextRoot(); } - // #4 Use the implicit context root derived from the deployment name - if (contextRoot == null) + return contextRoot; + } + + /** Use the implicit context root derived from the deployment name + */ + protected String getImplicitContextRoot(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + String simpleName = udi.simpleName; + String contextRoot = simpleName.substring(0, simpleName.length() - 4); + if (udi.parent != null) { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - String simpleName = udi.simpleName; - contextRoot = simpleName.substring(0, simpleName.length() - 4); - if (udi.parent != null) - { - simpleName = udi.parent.simpleName; - contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot; - } + simpleName = udi.parent.simpleName; + contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot; } - - // Always prefix with '/' - if (contextRoot.startsWith("/") == false) - contextRoot = "/" + contextRoot; - return contextRoot; } } \ No newline at end of file Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-06-08 19:17:32 UTC (rev 3515) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-06-08 19:55:32 UTC (rev 3516) @@ -42,12 +42,19 @@ { for (Endpoint ep : dep.getService().getEndpoints()) { - String urlPattern = getUrlPattern(dep, ep); + String urlPattern = getExplicitPattern(dep, ep); + if (urlPattern == null) + urlPattern = getImplicitPattern(dep, ep); + + // Always prefix with '/' + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; + ep.setURLPattern(urlPattern); } } - private String getUrlPattern(Deployment dep, Endpoint ep) + protected String getExplicitPattern(Deployment dep, Endpoint ep) { String urlPattern = null; @@ -81,17 +88,14 @@ if (anWebContext != null && anWebContext.urlPattern().length() > 0) urlPattern = anWebContext.urlPattern(); } + + return urlPattern; + } + protected String getImplicitPattern(Deployment dep, Endpoint ep) + { // #4 Fallback to the ejb-name - if (urlPattern == null) - { - urlPattern = ep.getShortName(); - } - - // Always prefix with '/' - if (urlPattern.startsWith("/") == false) - urlPattern = "/" + urlPattern; - + String urlPattern = ep.getShortName(); return urlPattern; } } \ No newline at end of file Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-08 19:55:32 UTC (rev 3516) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +//$Id$ + +import org.jboss.wsf.spi.deployment.ContextRootDeployer; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; + +/** + * A deployer that assigns the context root to the service. + * + * This deployer uses the first token from the <port-component-uri> + * as the context root. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class LegacyContextRootDeployer extends ContextRootDeployer +{ + @Override + protected String getExplicitContextRoot(Deployment dep) + { + String contextRoot = super.getExplicitContextRoot(dep); + if (contextRoot == null) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + String urlPattern = getUrlPattern(dep, ep); + if (urlPattern != null) + { + String[] tokens = urlPattern.split("/"); + if (tokens.length > 1) + { + contextRoot = tokens[0]; + } + } + } + } + return contextRoot; + } + + private String getUrlPattern(Deployment dep, Endpoint ep) + { + String urlPattern = null; + + UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) + { + UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); + UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + urlPattern = pcmd.getPortComponentURI(); + } + } + + return urlPattern; + } +} \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java 2007-06-08 19:55:32 UTC (rev 3516) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +//$Id$ + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.URLPatternDeployer; + +/** + * A deployer that assigns the URLPattern to endpoints. + * + * This deployer uses the first token from the <port-component-uri> + * as the context root. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public class LegacyURLPatternDeployer extends URLPatternDeployer +{ + + @Override + protected String getExplicitPattern(Deployment dep, Endpoint ep) + { + String contextRoot = dep.getService().getContextRoot(); + if (contextRoot == null) + throw new IllegalStateException("Cannot obtain context root"); + + String urlPattern = super.getExplicitPattern(dep, ep); + if (urlPattern != null) + { + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; + + String[] tokens = urlPattern.split("/"); + if (tokens.length > 1 && urlPattern.startsWith(contextRoot)) + { + urlPattern = urlPattern.substring(contextRoot.length()); + } + } + return urlPattern; + } +} \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyURLPatternDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3515 - in branches/jbossws-2.0: integration/spi/src/main/java/org/jboss/ws/integration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 15:17:32 -0400 (Fri, 08 Jun 2007) New Revision: 3515 Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java Log: Remove client runtime dependency on MC Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 19:17:32 UTC (rev 3515) @@ -122,8 +122,6 @@ <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-microcontainer.jar"/> <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/hibernate3.jar"/> Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-08 19:17:32 UTC (rev 3515) @@ -39,27 +39,38 @@ public static ServiceRefHandler getServiceRefHandler() { ServiceRefHandler handler; - Kernel kernel = KernelLocator.getKernel(); - if (kernel != null) + if (KernelLocator.getKernel() != null) { - KernelRegistry registry = kernel.getRegistry(); - KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler"); - handler = (ServiceRefHandler)entry.getTarget(); - - // Try legancy JBossAS-4.2 name - if (handler == null) - { - entry = registry.getEntry("ServiceRefHandler"); - handler = (ServiceRefHandler)entry.getTarget(); - } + handler = getServerSideServiceRefHandler(); } - // The client does not have a microkernel else { - String propName = ServiceRefHandler.class.getName(); - String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl"; - handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + handler = getClientSideServiceRefHandler(); } return handler; } + + private static ServiceRefHandler getServerSideServiceRefHandler() + { + Kernel kernel = KernelLocator.getKernel(); + KernelRegistry registry = kernel.getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler"); + ServiceRefHandler handler = (ServiceRefHandler)entry.getTarget(); + + // Try legancy JBossAS-4.2 name + if (handler == null) + { + entry = registry.getEntry("ServiceRefHandler"); + handler = (ServiceRefHandler)entry.getTarget(); + } + return handler; + } + + private static ServiceRefHandler getClientSideServiceRefHandler() + { + String propName = ServiceRefHandler.class.getName(); + String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl"; + ServiceRefHandler handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + return handler; + } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-06-08 19:17:32 UTC (rev 3515) @@ -109,7 +109,7 @@ String targetClassName = (targetClass != null ? targetClass.getName() : null); String externalName = encCtx.getNameInNamespace() + "/" + encName; - log.info("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); String serviceImplClass = null;

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3514 - branches/jbossws-2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 14:18:46 -0400 (Fri, 08 Jun 2007) New Revision: 3514 Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml Log: Add MC to test client classpath Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 17:59:06 UTC (rev 3513) +++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 18:18:46 UTC (rev 3514) @@ -122,6 +122,8 @@ <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss.lib}/jboss-dependency.jar"/> + <pathelement location="${jboss.lib}/jboss-microcontainer.jar"/> <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/hibernate3.jar"/>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3513 - in branches/jbossws-2.0: integration/spi/ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 13:59:06 -0400 (Fri, 08 Jun 2007) New Revision: 3513 Modified: branches/jbossws-2.0/build/version.properties branches/jbossws-2.0/integration/spi/ant-import/build-release.xml branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml Log: Fix release spi Modified: branches/jbossws-2.0/build/version.properties =================================================================== --- branches/jbossws-2.0/build/version.properties 2007-06-08 17:21:58 UTC (rev 3512) +++ branches/jbossws-2.0/build/version.properties 2007-06-08 17:59:06 UTC (rev 3513) @@ -6,7 +6,7 @@ specification.version=jbossws-2.0 version.id=2.0.0.GA -repository.id=2.0.0.GA +repository.id=snapshot implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws Modified: branches/jbossws-2.0/integration/spi/ant-import/build-release.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-release.xml 2007-06-08 17:21:58 UTC (rev 3512) +++ branches/jbossws-2.0/integration/spi/ant-import/build-release.xml 2007-06-08 17:59:06 UTC (rev 3513) @@ -23,9 +23,9 @@ <copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true"> <fileset dir="${spi.output.lib.dir}"> <include name="jbossws-spi.jar"/> - <include name="jbossws-integration-src.zip"/> - <include name="jbossws-spi-scripts.zip"/> - </fileset> + <include name="jbossws-spi-src.zip"/> + <include name="jbossws-spi-scripts.zip"/> + </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> Modified: branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-06-08 17:21:58 UTC (rev 3512) +++ branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-06-08 17:59:06 UTC (rev 3513) @@ -6,6 +6,7 @@ licenseType="lgpl"> <artifact id="jbossws-spi.jar"/> + <artifact id="jbossws-spi-scripts.zip"/> <export> <include input="jbossws-spi.jar"/> Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-06-08 17:21:58 UTC (rev 3512) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-06-08 17:59:06 UTC (rev 3513) @@ -40,6 +40,9 @@ <import componentref="sun-jaxb"> <compatible version="@sun-jaxb@"/> </import> + <import componentref="sun-jaxws"> + <compatible version="@sun-jaxws@"/> + </import> <export> <include input="jbossws-core.jar"/>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3512 - in branches/jbossws-2.0/integration: native/src/main/resources/jbossws-native50.sar/META-INF and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 13:21:58 -0400 (Fri, 08 Jun 2007) New Revision: 3512 Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java Log: ContextRoot, URLPattern always start with '/' Add ServiceRefHandlerFactory Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-08 17:21:58 UTC (rev 3512) @@ -33,10 +33,6 @@ <property name="bindAddress">${jboss.bind.address}</property> </bean> -  -  - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> -  <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-08 17:21:58 UTC (rev 3512) @@ -33,10 +33,6 @@ <property name="bindAddress">${jboss.bind.address}</property> </bean> -  -  - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> -  <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-08 17:21:58 UTC (rev 3512) @@ -34,8 +34,7 @@ </bean>  -  - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>  <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-06-08 17:21:58 UTC (rev 3512) @@ -37,8 +37,6 @@ */ public interface ServiceRefHandler { - String BEAN_NAME = "ServiceRefHandler"; - ServiceRefMetaData newServiceRefMetaData(); Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs); Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-08 17:21:58 UTC (rev 3512) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration; + +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.wsf.spi.utils.ServiceLoader; + +// $Id$ + +/** + * A factory for the ServiceRefHandler + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2004 + */ +public abstract class ServiceRefHandlerFactory +{ + public static ServiceRefHandler getServiceRefHandler() + { + ServiceRefHandler handler; + Kernel kernel = KernelLocator.getKernel(); + if (kernel != null) + { + KernelRegistry registry = kernel.getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler"); + handler = (ServiceRefHandler)entry.getTarget(); + + // Try legancy JBossAS-4.2 name + if (handler == null) + { + entry = registry.getEntry("ServiceRefHandler"); + handler = (ServiceRefHandler)entry.getTarget(); + } + } + // The client does not have a microkernel + else + { + String propName = ServiceRefHandler.class.getName(); + String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl"; + handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + } + return handler; + } +} Property changes on: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-06-08 17:21:58 UTC (rev 3512) @@ -26,7 +26,6 @@ import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * A deployer that assigns the context root to the service @@ -39,8 +38,14 @@ @Override public void create(Deployment dep) { + String contextRoot = getContextRoot(dep); + dep.getService().setContextRoot(contextRoot); + } + + private String getContextRoot(Deployment dep) + { String contextRoot = null; - + // #1 Use the explicit context root from the web meta data UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) @@ -83,9 +88,10 @@ } } - if (contextRoot.startsWith("/")) - contextRoot = contextRoot.substring(1); - - dep.getService().setContextRoot(contextRoot); + // Always prefix with '/' + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; + + return contextRoot; } } \ No newline at end of file Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-06-08 15:55:54 UTC (rev 3511) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-06-08 17:21:58 UTC (rev 3512) @@ -85,8 +85,12 @@ // #4 Fallback to the ejb-name if (urlPattern == null) { - urlPattern = "/" + ep.getShortName(); + urlPattern = ep.getShortName(); } + + // Always prefix with '/' + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; return urlPattern; }

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3511 - branches/jbossws-2.0/jbossws-core/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-08 11:55:54 -0400 (Fri, 08 Jun 2007) New Revision: 3511 Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.bat branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh Log: Fix JBWS-1588 Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.bat =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 15:52:05 UTC (rev 3510) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 15:55:54 UTC (rev 3511) @@ -40,23 +40,29 @@ set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed rem Setup the wstools classpath -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar + set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar + +rem taken from jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-logging-spi.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-core.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/concurrent.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-remoting.jar + rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 15:52:05 UTC (rev 3510) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 15:55:54 UTC (rev 3511) @@ -55,27 +55,29 @@ # Setup the java endorsed dirs JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" -# Setup the wstools classpath -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +# Setup the client classpath WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" +# subset of jbossall-client.jar: +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-logging-spi.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-common-core.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/concurrent.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-remoting.jar" + while [ $# -ge 1 ]; do case $1 in "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3510 - trunk/jbossws-core/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-08 11:52:05 -0400 (Fri, 08 Jun 2007) New Revision: 3510 Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat trunk/jbossws-core/src/main/etc/wsrunclient.sh Log: Fix JBWS-1588 Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat =================================================================== --- trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 15:50:12 UTC (rev 3509) +++ trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 15:52:05 UTC (rev 3510) @@ -40,23 +40,29 @@ set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed rem Setup the wstools classpath -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar + set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar + +rem taken from jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-logging-spi.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-core.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/concurrent.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-remoting.jar + rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: trunk/jbossws-core/src/main/etc/wsrunclient.sh =================================================================== --- trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 15:50:12 UTC (rev 3509) +++ trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 15:52:05 UTC (rev 3510) @@ -55,27 +55,29 @@ # Setup the java endorsed dirs JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" -# Setup the wstools classpath -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +# Setup the client classpath WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" +# subset of jbossall-client.jar: +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-logging-spi.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-common-core.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/concurrent.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-remoting.jar" + while [ $# -ge 1 ]; do case $1 in "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007