January 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1834 - trunk/integration-jboss40

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:51 -0500 (Fri, 05 Jan 2007) New Revision: 1834 Modified: trunk/integration-jboss40/build.xml Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-05 21:52:44 UTC (rev 1833) +++ trunk/integration-jboss40/build.xml 2007-01-05 21:52:51 UTC (rev 1834) @@ -13,8 +13,8 @@ <project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40"> + <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1833 - in trunk/build: . ant-import

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:44 -0500 (Fri, 05 Jan 2007) New Revision: 1833 Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/build.xml trunk/build/version.properties Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-release.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -209,7 +209,6 @@ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> - <include name="log4j.jar"/> <include name="mailapi.jar"/> </fileset> <fileset dir="${core.output.lib.dir}"> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-samples.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -16,7 +16,7 @@  - <target name="build-samples" description="Builds the samples." depends="prepare"> + <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars"> <property name="samples.target" value="jbossws-samples-${version.id}"/> <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -75,10 +75,10 @@ <target name="prepare"> - <echo message="jboss50.home = ${jboss50.home}"/> - <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="jboss40.home = ${jboss40.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="jboss50.home = ${jboss50.home}"/> + <echo message="jboss42.home = ${jboss42.home}"/> + <echo message="jboss40.home = ${jboss40.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> <echo/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -38,7 +38,8 @@ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> @@ -48,6 +49,7 @@ <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> @@ -68,74 +70,64 @@ <target name="thirdparty-classpath" > -  - <path id="library.classpath"> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> +  + <path id="jbossws.thirdparty.classpath"> <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/concurrent.jar"/> - <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/hibernate3.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-container.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> + <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/log4j.jar"/> <pathelement location="${thirdparty.dir}/mailapi.jar"/> - <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> - <pathelement location="${thirdparty.dir}/xalan.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/xml-apis.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> </path> - -  + +  <path id="core.classpath"> - <path refid="library.classpath"/> + <path refid="jbossws.thirdparty.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${thirdparty.dir}/jboss-container.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> </path> -  +  <path id="jboss50.integration.classpath"> <path refid="core.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-mbeans.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> </path> -  +  <path id="jboss42.integration.classpath"> <path refid="core.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> - <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> - <pathelement location="${jboss42.server.lib}/jbosssx.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> </path> -  +  <path id="tomcat.integration.classpath"> <path refid="core.classpath"/> </path> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/build.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -16,6 +16,7 @@ <import file="${basedir}/ant-import/build-thirdparty.xml"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-samples.xml"/> <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/version.properties 2007-01-05 21:52:44 UTC (rev 1833) @@ -31,9 +31,11 @@ hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA jboss-common-core=2.0.2.CR1 -jboss-common-logging=2.0.1.GA +jboss-common-logging-log4j=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 jboss-jbossretro=1.0.4.GA +jboss-vfs=2.0.0.snapshot jbossas-core-libs=4.0.5.GA jbpm-bpel=1.1.Beta2 junit=3.8.1

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1832 - trunk/integration-jboss50

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:38 -0500 (Fri, 05 Jan 2007) New Revision: 1832 Modified: trunk/integration-jboss50/build.xml Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-01-05 21:52:30 UTC (rev 1831) +++ trunk/integration-jboss50/build.xml 2007-01-05 21:52:38 UTC (rev 1832) @@ -13,8 +13,8 @@ <project default="main" basedir="../integration-jboss50" name="JBossWS-JBoss50"> + <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1831 - in trunk/jbossws-docs: online/tutorial-doc/en/modules/getting-started user-guide/project/en/modules/getting-started user-guide/project/en/modules/installation

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:30 -0500 (Fri, 05 Jan 2007) New Revision: 1831 Modified: trunk/jbossws-docs/online/tutorial-doc/en/modules/getting-started/rpc-endpoints.xml trunk/jbossws-docs/user-guide/project/en/modules/getting-started/rpc-endpoints.xml trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/jbossws-docs/online/tutorial-doc/en/modules/getting-started/rpc-endpoints.xml =================================================================== --- trunk/jbossws-docs/online/tutorial-doc/en/modules/getting-started/rpc-endpoints.xml 2007-01-05 21:52:21 UTC (rev 1830) +++ trunk/jbossws-docs/online/tutorial-doc/en/modules/getting-started/rpc-endpoints.xml 2007-01-05 21:52:30 UTC (rev 1831) @@ -122,8 +122,7 @@ <programlisting><![CDATA[  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="library.classpath"/> - <classpath refid="test.client.classpath"/> + <classpath refid="compile.classpath"/> <classpath path="${build.test.classes.dir}"/> </taskdef> Modified: trunk/jbossws-docs/user-guide/project/en/modules/getting-started/rpc-endpoints.xml =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/getting-started/rpc-endpoints.xml 2007-01-05 21:52:21 UTC (rev 1830) +++ trunk/jbossws-docs/user-guide/project/en/modules/getting-started/rpc-endpoints.xml 2007-01-05 21:52:30 UTC (rev 1831) @@ -122,8 +122,7 @@ <programlisting><![CDATA[  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="library.classpath"/> - <classpath refid="test.client.classpath"/> + <classpath refid="compile.classpath"/> <classpath path="${build.test.classes.dir}"/> </taskdef> Modified: trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-05 21:52:21 UTC (rev 1830) +++ trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-05 21:52:30 UTC (rev 1831) @@ -34,7 +34,6 @@ <listitem>jboss-jaxrpc.jar</listitem> <listitem>jboss-jaxws.jar</listitem> <listitem>jboss-saaj.jar</listitem> - <listitem>log4j.jar</listitem> <listitem>mailapi.jar</listitem> </itemizedlist> </para>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1830 - in trunk/jbossws-tests: . src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity src/main/java/org/jboss/test/ws/jaxws/jbws981 src/main/resources

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:21 -0500 (Fri, 05 Jan 2007) New Revision: 1830 Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-05 21:52:07 UTC (rev 1829) +++ trunk/jbossws-tests/build.xml 2007-01-05 21:52:21 UTC (rev 1830) @@ -12,8 +12,9 @@ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> + <import file="${basedir}/../integration-jboss42/build.xml"/> + <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> @@ -52,12 +53,28 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> </condition> +  + <condition property="jbossws.integration.target.jboss"> + <isset property="jboss.home"/> + </condition> + <condition property="jbossws.integration.target.tomcat"> + <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> + </condition> + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> +  + <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.integration.target.jboss"/> + </condition> + <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> + <isset property="jbossws.integration.target.tomcat"/> + </condition> +  <property name="tests.excludesfile" value="${tests.resources.dir}/tests-${jbossws.integration.target}-excludes.txt"/>  <path id="jbossws.client.classpath"> - <pathelement location="${jboss.client}/${jbossws.client.jar}"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-logging-log4j.jar"/> - <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/> - <pathelement location="${jboss.client}/jboss-jaxws.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossretro-rt.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.lib}/jboss-container.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <path refid="jbossws.thirdparty.classpath"/> + <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> </path>  <path id="javac.classpath"> - <path refid="library.classpath"/> <path refid="jbossws.client.classpath"/> - <pathelement location="${jboss.lib}/jboss-system.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> - </path> - -  - <path id="test.client.classpath"> - <path refid="jbossws.client.classpath"/> - <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.lib}/jboss-system.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${thirdparty.dir}/hibernate3.jar"/> - <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> + <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.9.3.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> </path> + +  + <path id="test.client.classpath"> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> + <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> + <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> + <path refid="javac.classpath"/> + </path> </target>  @@ -327,7 +320,7 @@ </target>  - <target name="tests-benchmark" description="Run benchmark unit tests"> + <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> <param name="excludesfile" value="${tests.excludesfile}"/> @@ -345,7 +338,7 @@ </target>  - <target name="tests-tools" description="Run tools unit tests"> + <target name="tests-tools" depends="init" description="Run tools unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> <param name="excludesfile" value="${tests.excludesfile}"/> @@ -357,7 +350,7 @@ Run a collection of unit tests. ant -Dtest=tools test --> - <target name="test" if="test" description="Run all unit tests in a given directory"> + <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> @@ -376,7 +369,7 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> @@ -415,7 +408,7 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-01-05 21:52:07 UTC (rev 1829) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-01-05 21:52:21 UTC (rev 1830) @@ -23,15 +23,11 @@ import java.io.File; import java.net.URL; -import java.util.HashMap; -import java.util.List; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.Stub; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.HandlerRegistry; import junit.framework.Test; @@ -39,7 +35,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.ServiceImpl; -import org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound; +import org.jboss.ws.core.jaxrpc.StubExt; /** * Test WS-Security with RPC/Literal @@ -87,17 +83,14 @@ URL securityURL = new File("resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort"); - ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL); - HandlerRegistry registry = service.getDynamicHandlerRegistry(); - List infos = registry.getHandlerChain(portName); - infos.add(new HandlerInfo(WSSecurityHandlerOutbound.class, new HashMap(), new QName[]{})); - registry.setHandlerChain(portName, infos); - Hello port = (Hello)service.getPort(Hello.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-encrypt"); + StubExt stub = (StubExt)port; + + stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-encrypt"); + stub.setConfigName("Standard WSSecurity Client"); + return port; } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-01-05 21:52:07 UTC (rev 1829) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-01-05 21:52:21 UTC (rev 1830) @@ -39,6 +39,7 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.ServiceImpl; +import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound; /** @@ -91,13 +92,12 @@ ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL); - HandlerRegistry registry = service.getDynamicHandlerRegistry(); - List infos = registry.getHandlerChain(portName); - infos.add(new HandlerInfo(WSSecurityHandlerOutbound.class, new HashMap(), new QName[]{})); - registry.setHandlerChain(portName, infos); + Hello port = (Hello)service.getPort(Hello.class); + StubExt stub = (StubExt)port; - Hello port = (Hello)service.getPort(Hello.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-sign"); + stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-sign"); + stub.setConfigName("Standard WSSecurity Client"); + return port; } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2007-01-05 21:52:07 UTC (rev 1829) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2007-01-05 21:52:21 UTC (rev 1830) @@ -24,10 +24,10 @@ import javax.ejb.Stateless; import javax.jws.WebService; import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; import javax.management.ObjectName; import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; /** * @@ -43,9 +43,9 @@ public String hello(final String message) { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); try { + MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer("jboss").get(0); ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/..."); mbeanServer.getMBeanInfo(on); } Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-05 21:52:07 UTC (rev 1829) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-05 21:52:21 UTC (rev 1830) @@ -6,3 +6,4 @@ org/jboss/test/ws/jaxrpc/samples/wsbpel/** org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/**

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1829 - in trunk/jbossws-core: . src/main/java/org/jboss/ws/core src/main/java/org/jboss/ws/core/jaxrpc src/main/java/org/jboss/ws/metadata/umdm src/main/java/org/jboss/ws/metadata/webservices src/main/resources/samples/common

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:07 -0500 (Fri, 05 Jan 2007) New Revision: 1829 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/PortProxy.java Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java Modified: trunk/jbossws-core/.classpath trunk/jbossws-core/build.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/HandlerRegistryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/StubExt.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/.classpath 2007-01-05 21:52:07 UTC (rev 1829) @@ -36,5 +36,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/build.xml 2007-01-05 21:52:07 UTC (rev 1829) @@ -13,9 +13,8 @@ <project default="main" basedir="../jbossws-core" name="JBossWS-Main"> - <import file="${basedir}/../build/ant-import/build-samples.xml"/> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/../build/ant-import/build-setup.xml"/> <property name="core.src.dir" value="${core.dir}/src/main"/> <property name="core.java.dir" value="${core.src.dir}/java"/> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -307,9 +307,6 @@ // unbind the return values if (handlerPass) { - // BP-1.0 R1027 - HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[]{}); - // unbind the return values SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); @@ -320,6 +317,10 @@ handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.ENDPOINT); handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.PRE); + // BP-1.0 R1027 + if (handlerPass) + HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[]{}); + // Check if protocol handlers modified the payload if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource()) { @@ -327,7 +328,7 @@ SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); } - + retObj = syncOutputParams(inputParams, epInv); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -140,6 +140,11 @@ setTargetEndpointAddress(epMetaData.getEndpointAddress()); } + public ServiceImpl getServiceImpl() + { + return jaxrpcService; + } + @Override protected Map<String, Object> getRequestContext() { Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -1,207 +0,0 @@ -/* -* 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.jaxrpc; - -// $Id$ - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.rmi.RemoteException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Stub; -import javax.xml.rpc.soap.SOAPFaultException; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; - -/** - * The dynamic proxy that delegates to the underlying Call implementation - * - * @author Thomas.Diesler(a)jboss.org - * @since 07-Jan-2005 - */ -public class CallProxy implements InvocationHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(CallProxy.class); - - // The underlying Call - private CallImpl call; - // List<Method> of the Stub methods - private List stubMethods; - // List<Method> of the Object methods - private List objectMethods; - - // The set of standard properties - private static final Set<String> standardProperties = new HashSet<String>(); - static - { - standardProperties.add(Stub.ENDPOINT_ADDRESS_PROPERTY); - standardProperties.add(Stub.SESSION_MAINTAIN_PROPERTY); - standardProperties.add(Stub.USERNAME_PROPERTY); - standardProperties.add(Stub.PASSWORD_PROPERTY); - } - - // The map of jboss-ws4ee supported properties - private static final Map<String,String> legacyPropertyMap = new HashMap<String,String>(); - static - { - legacyPropertyMap.put("org.jboss.webservice.client.timeout", StubExt.PROPERTY_CLIENT_TIMEOUT); - legacyPropertyMap.put("org.jboss.webservice.keyStore", StubExt.PROPERTY_KEY_STORE); - legacyPropertyMap.put("org.jboss.webservice.keyStorePassword", StubExt.PROPERTY_KEY_STORE_PASSWORD); - legacyPropertyMap.put("org.jboss.webservice.keyStoreType", StubExt.PROPERTY_KEY_STORE_TYPE); - legacyPropertyMap.put("org.jboss.webservice.trustStore", StubExt.PROPERTY_TRUST_STORE); - legacyPropertyMap.put("org.jboss.webservice.trustStorePassword", StubExt.PROPERTY_TRUST_STORE_PASSWORD); - legacyPropertyMap.put("org.jboss.webservice.trustStoreType", StubExt.PROPERTY_TRUST_STORE_TYPE); - } - - public CallProxy(CallImpl call) - { - this.call = call; - this.stubMethods = Arrays.asList(StubExt.class.getMethods()); - this.objectMethods = Arrays.asList(Object.class.getMethods()); - } - - /** Processes a method invocation on a proxy instance and returns the result. - */ - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable - { - // An invocation on the Stub interface - String methodName = method.getName(); - if (stubMethods.contains(method)) - { - if (methodName.equals("_getPropertyNames")) - { - return call.getPropertyNames(); - } - else if (methodName.equals("_getProperty")) - { - return getProperty((String)args[0]); - } - else if (methodName.equals("_setProperty")) - { - setProperty((String)args[0], args[1]); - return null; - } - else - { - Method callMethod = CallImpl.class.getMethod(methodName, method.getParameterTypes()); - return callMethod.invoke(call, args); - } - } - - // An invocation on proxy's Object class - else if (objectMethods.contains(method)) - { - Method callMethod = CallImpl.class.getMethod(methodName, method.getParameterTypes()); - return callMethod.invoke(call, args); - } - - // An invocation on the service endpoint interface - else - { - EndpointMetaData epMetaData = call.getEndpointMetaData(); - OperationMetaData opMetaData = epMetaData.getOperation(method); - if (opMetaData == null) - throw new WSException("Cannot obtain operation meta data for: " + methodName); - - call.setOperationName(opMetaData.getQName()); - - try - { - if (opMetaData.isOneWay()) - { - call.invokeOneWay(args); - return null; - } - else - { - Object retObj = call.invoke(args); - if (retObj != null) - { - Class retType = method.getReturnType(); - if (retType == null) - throw new WSException("Return value not supported by: " + opMetaData); - - if (JavaUtils.isPrimitive(retType)) - retObj = JavaUtils.getPrimitiveValueArray(retObj); - } - return retObj; - } - } - catch (Exception ex) - { - handleException(ex); - return null; - } - } - } - - private Object getProperty(String name) - { - name = assertPropertyName(name); - return call.getProperty(name); - } - - private void setProperty(String name, Object value) - { - name = assertPropertyName(name); - call.setProperty(name, value); - } - - private String assertPropertyName(String name) - { - if (name != null && name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false) - throw new JAXRPCException("Unsupported property: " + name); - - if (legacyPropertyMap.keySet().contains(name)) - { - String jbosswsName = legacyPropertyMap.get(name); - log.warn("Legacy propery '" + name + "' mapped to '" + jbosswsName + "'"); - name = jbosswsName; - } - - return name; - } - - private void handleException(Exception ex) throws Throwable - { - Throwable th = ex; - if (ex instanceof RemoteException && ex.getCause() instanceof SOAPFaultException) - { - SOAPFaultException faultEx = (SOAPFaultException)ex.getCause(); - if (faultEx.getCause() != null) - th = faultEx.getCause(); - } - throw th; - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/HandlerRegistryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/HandlerRegistryImpl.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/HandlerRegistryImpl.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -79,7 +79,6 @@ list = new ArrayList<HandlerInfo>(); return new ArrayList(list); - } public void setHandlerChain(QName portName, List chain) Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/PortProxy.java (from rev 1775, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallProxy.java 2007-01-02 19:15:19 UTC (rev 1775) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/PortProxy.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -0,0 +1,242 @@ +/* +* 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.jaxrpc; + +// $Id$ + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.Stub; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.soap.SOAPFaultException; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; + +/** + * The dynamic proxy that delegates to the underlying Call implementation + * + * @author Thomas.Diesler(a)jboss.org + * @since 07-Jan-2005 + */ +public class PortProxy implements InvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(PortProxy.class); + + // The underlying Call + private CallImpl call; + // List<Method> of the Stub methods + private List stubMethods; + // List<Method> of the Object methods + private List objectMethods; + + // The set of standard properties + private static final Set<String> standardProperties = new HashSet<String>(); + static + { + standardProperties.add(Stub.ENDPOINT_ADDRESS_PROPERTY); + standardProperties.add(Stub.SESSION_MAINTAIN_PROPERTY); + standardProperties.add(Stub.USERNAME_PROPERTY); + standardProperties.add(Stub.PASSWORD_PROPERTY); + } + + // The map of jboss-ws4ee supported properties + private static final Map<String,String> legacyPropertyMap = new HashMap<String,String>(); + static + { + legacyPropertyMap.put("org.jboss.webservice.client.timeout", StubExt.PROPERTY_CLIENT_TIMEOUT); + legacyPropertyMap.put("org.jboss.webservice.keyStore", StubExt.PROPERTY_KEY_STORE); + legacyPropertyMap.put("org.jboss.webservice.keyStorePassword", StubExt.PROPERTY_KEY_STORE_PASSWORD); + legacyPropertyMap.put("org.jboss.webservice.keyStoreType", StubExt.PROPERTY_KEY_STORE_TYPE); + legacyPropertyMap.put("org.jboss.webservice.trustStore", StubExt.PROPERTY_TRUST_STORE); + legacyPropertyMap.put("org.jboss.webservice.trustStorePassword", StubExt.PROPERTY_TRUST_STORE_PASSWORD); + legacyPropertyMap.put("org.jboss.webservice.trustStoreType", StubExt.PROPERTY_TRUST_STORE_TYPE); + } + + public PortProxy(CallImpl call) + { + this.call = call; + this.stubMethods = Arrays.asList(StubExt.class.getMethods()); + this.objectMethods = Arrays.asList(Object.class.getMethods()); + } + + /** Processes a method invocation on a proxy instance and returns the result. + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable + { + // An invocation on the Stub interface + String methodName = method.getName(); + if (stubMethods.contains(method)) + { + if (methodName.equals("_getPropertyNames")) + { + return call.getPropertyNames(); + } + else if (methodName.equals("_getProperty")) + { + return getProperty((String)args[0]); + } + else if (methodName.equals("_setProperty")) + { + setProperty((String)args[0], args[1]); + return null; + } + else if (methodName.equals("getConfigFile")) + { + EndpointMetaData epMetaData = call.getEndpointMetaData(); + return epMetaData.getConfigFile(); + } + else if (methodName.equals("setConfigFile")) + { + EndpointMetaData epMetaData = call.getEndpointMetaData(); + epMetaData.setConfigFile((String)args[0]); + return null; + } + else if (methodName.equals("getConfigName")) + { + EndpointMetaData epMetaData = call.getEndpointMetaData(); + return epMetaData.getConfigName(); + } + else if (methodName.equals("setConfigName")) + { + EndpointMetaData epMetaData = call.getEndpointMetaData(); + epMetaData.setConfigName((String)args[0]); + epMetaData.configure(epMetaData); + + // Reinitialize the client handler chain + ServiceImpl jaxrpcService = call.getServiceImpl(); + jaxrpcService.setupHandlerChain(epMetaData); + + return null; + } + else + { + Method callMethod = CallImpl.class.getMethod(methodName, method.getParameterTypes()); + return callMethod.invoke(call, args); + } + } + + // An invocation on proxy's Object class + else if (objectMethods.contains(method)) + { + Method callMethod = CallImpl.class.getMethod(methodName, method.getParameterTypes()); + return callMethod.invoke(call, args); + } + + // An invocation on the service endpoint interface + else + { + EndpointMetaData epMetaData = call.getEndpointMetaData(); + OperationMetaData opMetaData = epMetaData.getOperation(method); + if (opMetaData == null) + throw new WSException("Cannot obtain operation meta data for: " + methodName); + + call.setOperationName(opMetaData.getQName()); + + try + { + if (opMetaData.isOneWay()) + { + call.invokeOneWay(args); + return null; + } + else + { + Object retObj = call.invoke(args); + if (retObj != null) + { + Class retType = method.getReturnType(); + if (retType == null) + throw new WSException("Return value not supported by: " + opMetaData); + + if (JavaUtils.isPrimitive(retType)) + retObj = JavaUtils.getPrimitiveValueArray(retObj); + } + return retObj; + } + } + catch (Exception ex) + { + handleException(ex); + return null; + } + } + } + + private Object getProperty(String name) + { + name = assertPropertyName(name); + return call.getProperty(name); + } + + private void setProperty(String name, Object value) + { + name = assertPropertyName(name); + call.setProperty(name, value); + } + + private String assertPropertyName(String name) + { + if (name != null && name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false) + throw new JAXRPCException("Unsupported property: " + name); + + if (legacyPropertyMap.keySet().contains(name)) + { + String jbosswsName = legacyPropertyMap.get(name); + log.warn("Legacy propery '" + name + "' mapped to '" + jbosswsName + "'"); + name = jbosswsName; + } + + return name; + } + + private void handleException(Exception ex) throws Throwable + { + Throwable th = ex; + if (ex instanceof RemoteException && ex.getCause() instanceof SOAPFaultException) + { + SOAPFaultException faultEx = (SOAPFaultException)ex.getCause(); + if (faultEx.getCause() != null) + th = faultEx.getCause(); + } + throw th; + } +} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -27,6 +27,8 @@ import java.net.URL; import java.rmi.Remote; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -36,15 +38,21 @@ import javax.xml.rpc.ServiceException; import javax.xml.rpc.encoding.TypeMappingRegistry; import javax.xml.rpc.handler.HandlerChain; +import javax.xml.rpc.handler.HandlerInfo; import javax.xml.rpc.handler.HandlerRegistry; +import org.jboss.logging.Logger; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** @@ -61,6 +69,9 @@ */ public class ServiceImpl implements ServiceExt { + // provide logging + private static final Logger log = Logger.getLogger(ServiceImpl.class); + // The service meta data that is associated with this JAXRPC Service private ServiceMetaData serviceMetaData; @@ -379,7 +390,7 @@ { CallImpl call = new CallImpl(this, epMetaData); - CallProxy handler = new CallProxy(call); + PortProxy handler = new PortProxy(call); ClassLoader cl = epMetaData.getClassLoader(); Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, StubExt.class }, handler); @@ -401,4 +412,37 @@ { handlerRegistry.registerClientHandlerChain(portName, infos, roles); } + + void setupHandlerChain(EndpointMetaData epMetaData) + { + QName portName = epMetaData.getQName(); + Set<String> handlerRoles = new HashSet<String>(); + ArrayList handlerInfos = new ArrayList(); + for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL)) + { + HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData; + handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); + + HashMap hConfig = new HashMap(); + for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) + { + hConfig.put(param.getParamName(), param.getParamValue()); + } + + Set<QName> headers = jaxrpcMetaData.getSoapHeaders(); + QName[] headerArr = new QName[headers.size()]; + headers.toArray(headerArr); + + Class hClass = jaxrpcMetaData.getHandlerClass(); + hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); + HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); + + log.debug("Adding client side handler to endpoint '" + portName + "': " + info); + handlerInfos.add(info); + + // register the handlers with the client engine + if (handlerInfos.size() > 0) + registerHandlerChain(portName, handlerInfos, handlerRoles); + } + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -233,7 +233,7 @@ } // Setup the handler chain - setupHandlerChain(jaxrpcService, serviceRefMetaData); + setupHandlerChain(jaxrpcService); InvocationHandler handler = new ServiceProxy(jaxrpcService, siClass); return Proxy.newProxyInstance(contextCL, new Class[] { siClass, ServiceExt.class }, handler); @@ -247,45 +247,13 @@ /** * Setup the handler chain(s) for this service - * <p/> - * This registers a handler chain with the service for every endpoint - * that has handlers configured in the <service-ref> element */ - private void setupHandlerChain(ServiceImpl jaxrpcService, UnifiedServiceRefMetaData serviceRefMetaData) throws Exception + private void setupHandlerChain(ServiceImpl jaxrpcService) throws Exception { List<EndpointMetaData> endpoints = jaxrpcService.getServiceMetaData().getEndpoints(); for (EndpointMetaData epMetaData : endpoints) { - QName portName = epMetaData.getQName(); - - Set<String> handlerRoles = new HashSet<String>(); - ArrayList handlerInfos = new ArrayList(); - for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL)) - { - HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData; - handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); - - HashMap hConfig = new HashMap(); - for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) - { - hConfig.put(param.getParamName(), param.getParamValue()); - } - - Set<QName> headers = jaxrpcMetaData.getSoapHeaders(); - QName[] headerArr = new QName[headers.size()]; - headers.toArray(headerArr); - - Class hClass = jaxrpcMetaData.getHandlerClass(); - hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); - HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); - - log.debug("Adding client side handler to endpoint '" + portName + "': " + info); - handlerInfos.add(info); - - // register the handlers with the client engine - if (handlerInfos.size() > 0) - jaxrpcService.registerHandlerChain(portName, handlerInfos, handlerRoles); - } + jaxrpcService.setupHandlerChain(epMetaData); } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/StubExt.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/StubExt.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/StubExt.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -109,4 +109,28 @@ * A propriatory extension, that is not part of JAXRPC. */ Iterator getUnboundHeaders(); + + /** + * Get the current port configuration file + * A propriatory extension, that is not part of JAXRPC. + */ + String getConfigFile(); + + /** + * Set the current port configuration file + * A propriatory extension, that is not part of JAXRPC. + */ + void setConfigFile(String configFile); + + /** + * Get the current port configuration name + * A propriatory extension, that is not part of JAXRPC. + */ + String getConfigName(); + + /** + * Set the current port configuration name + * A propriatory extension, that is not part of JAXRPC. + */ + void setConfigName(String configName); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -64,8 +64,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2005 */ -public abstract class EndpointMetaData extends ExtensibleMetaData - implements ConfigurationProvider, Configurable +public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, Configurable { // provide logging private static Logger log = Logger.getLogger(EndpointMetaData.class); @@ -163,10 +162,8 @@ public void setBindingId(String bindingId) { - if (!Constants.SOAP11HTTP_BINDING.equals(bindingId) - && !Constants.SOAP12HTTP_BINDING.equals(bindingId) - && !Constants.SOAP11HTTP_MTOM_BINDING.equals(bindingId) - && !Constants.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (!Constants.SOAP11HTTP_BINDING.equals(bindingId) && !Constants.SOAP12HTTP_BINDING.equals(bindingId) && !Constants.SOAP11HTTP_MTOM_BINDING.equals(bindingId) + && !Constants.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) { throw new WSException("Unsupported binding: " + bindingId); } @@ -198,7 +195,7 @@ /** Get the class loader associated with the endpoint meta data */ public ClassLoader getClassLoader() { - return getServiceMetaData().getUnifiedMetaData().getClassLoader(); + return getServiceMetaData().getUnifiedMetaData().getClassLoader(); } /** @@ -393,10 +390,10 @@ boolean doesMatch = aux.getJavaMethod().equals(method); // fallback for async methods - if(!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) + if (!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) { String name = method.getName(); - name = name.substring(0, name.length()-5); + name = name.substring(0, name.length() - 5); doesMatch = aux.getJavaName().equals(name); } @@ -522,7 +519,8 @@ List<Class> registeredTypes = typeMapping.getJavaTypes(xmlType); boolean registered = false; - for (Class current : registeredTypes) { + for (Class current : registeredTypes) + { if (current.getName().equals(javaTypeName)) { registered = true; @@ -573,20 +571,21 @@ * * @param configurable */ - public void configure(Configurable configurable) { + public void configure(Configurable configurable) + { - if(null == endpointConfig) + if (endpointConfig == null) { JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); endpointConfig = factory.getConfig(getConfigName(), getConfigFile()); } // SOAPBinding configuration - if(configurable instanceof CommonBindingProvider) + if (configurable instanceof CommonBindingProvider) { log.debug("Configure SOAPBinding"); - if(endpointConfig.hasFeature(EndpointFeature.MTOM)) + if (endpointConfig.hasFeature(EndpointFeature.MTOM)) { ((CommonSOAPBinding)configurable).setMTOMEnabled(true); log.debug("Enable MTOM on endpoint " + this.getQName()); @@ -594,9 +593,8 @@ } // Configure EndpointMetaData - else if(configurable instanceof EndpointMetaData) + else if (configurable instanceof EndpointMetaData) { - log.debug("Configure EndpointMetaData"); List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); @@ -612,7 +610,6 @@ log.debug("Added " + preHandlers.size() + " PRE handlers"); log.debug("Added " + postHandlers.size() + " POST handlers"); } - } public String getConfigFile() @@ -636,5 +633,4 @@ this.configName = configName; this.endpointConfig = null; } - } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-01-05 21:52:07 UTC (rev 1829) @@ -26,7 +26,6 @@ import java.net.URL; import org.jboss.logging.Logger; -import org.jboss.virtual.VirtualFile; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.xb.binding.ObjectModelFactory; Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 21:52:07 UTC (rev 1829) @@ -24,8 +24,8 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> @@ -50,26 +50,32 @@ <target name="thirdparty-classpath"> +  <path id="client.classpath"> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="commons-logging.jar"/> - <include name="concurrent.jar"/> - <include name="javassist.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jboss-common-core.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jboss-logging-spi.jar"/> - <include name="jboss-xml-binding.jar"/> - <include name="jbossws-client.jar"/> - <include name="log4j.jar"/> - <include name="mail.jar"/> - <include name="wsdl4j.jar"/> - <include name="xml-apis.jar"/> - </fileset> + <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/commons-logging.jar"/> + <pathelement location="${thirdparty.dir}/concurrent.jar"/> + <pathelement location="${thirdparty.dir}/javassist.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-container.jar"/> + <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> + <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/xmlsec.jar"/> + + <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/> + <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-client.jar"/> </path> <path id="compile.classpath"> Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 16:10:32 UTC (rev 1828) +++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 21:52:07 UTC (rev 1829) @@ -42,6 +42,14 @@ <condition property="jbossws.integration.target.tomcat"> <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> </condition> + +  + <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.integration.target.jboss"/> + </condition> + <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> + <isset property="jbossws.integration.target.tomcat"/> + </condition>  - <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> - </condition> - <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> @@ -135,9 +138,6 @@ </condition> <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/> -  - <property name="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"/> - </target>  @@ -220,7 +220,7 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="log.dir" value="${build.tests.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> @@ -264,7 +264,7 @@ <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="log.dir" value="${build.tests.dir}/log"/> - <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1828 - trunk/integration-jboss42

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:10:32 -0500 (Fri, 05 Jan 2007) New Revision: 1828 Modified: trunk/integration-jboss42/build.xml Log: Fix jbossws-samples Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-05 16:10:28 UTC (rev 1827) +++ trunk/integration-jboss42/build.xml 2007-01-05 16:10:32 UTC (rev 1828) @@ -76,7 +76,7 @@  <mkdir dir="${jboss42.output.lib.dir}"/> - <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> @@ -95,7 +95,7 @@ </war>  - <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws-jboss42-integration.jar"/> <include name="jbossws-context.war"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1827 - trunk/integration-tomcat

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:10:28 -0500 (Fri, 05 Jan 2007) New Revision: 1827 Modified: trunk/integration-tomcat/build.xml Log: Fix jbossws-samples Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-05 16:10:24 UTC (rev 1826) +++ trunk/integration-tomcat/build.xml 2007-01-05 16:10:28 UTC (rev 1827) @@ -78,7 +78,7 @@  <mkdir dir="${tomcat.output.lib.dir}"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${tomcat.output.classes.dir}"> <include name="org/jboss/ws/integration/tomcat/**"/> </fileset> @@ -122,7 +122,7 @@ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${tomcat.output.lib.dir}/build"/> </jar> <delete dir="${tomcat.output.lib.dir}/build"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1826 - trunk/integration-jboss40

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:10:24 -0500 (Fri, 05 Jan 2007) New Revision: 1826 Modified: trunk/integration-jboss40/build.xml Log: Fix jbossws-samples Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-05 16:10:17 UTC (rev 1825) +++ trunk/integration-jboss40/build.xml 2007-01-05 16:10:24 UTC (rev 1826) @@ -118,7 +118,7 @@  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> @@ -137,7 +137,7 @@ </war>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws-jboss40-integration.jar"/> <include name="jbossws-context.war"/> @@ -174,11 +174,11 @@  - <target name="jboss40-module-jars14" depends="jboss40-jars,jboss40-retro"> + <target name="jboss40-jars14" depends="jboss40-jars,jboss40-retro">  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> @@ -187,7 +187,7 @@  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> @@ -199,7 +199,7 @@ </jar>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> @@ -207,7 +207,7 @@ </jar>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> @@ -225,7 +225,7 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${output.etc.dir}"> + <fileset dir="${etc.dir}"> <include name="wstools.sh"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> @@ -237,7 +237,7 @@ <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> @@ -295,13 +295,14 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> </target>  - <target name="deploy-jboss40-jdk14" depends="jboss40-module-jars14" description="Deploy jbossws"> + <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <delete file="${jboss40.home}/client/jbossws-client.jar"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1825 - in trunk/build: . ant-import etc

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:10:17 -0500 (Fri, 05 Jan 2007) New Revision: 1825 Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/build.xml trunk/build/etc/jbossws-component-info.xml trunk/build/version.properties Log: Fix jbossws-samples Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-release.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -13,6 +13,9 @@ <project default="release" name="JBossWS Release"> + <property name="build.bin.dist" value="${build.output.dir}/bin-dist"/> + <property name="build.src.dist" value="${build.output.dir}/src-dist"/> + <target name="release" depends="all,release-to-repository,release-to-portal" description="Release JBossWS"> <echo message="*********************************************"/> <echo message="* Released: jbossws-${version.id}"/> @@ -26,7 +29,7 @@ <echo message="* 5) Verify release notes and install instructions"/> <echo message="* 6) Commit the portal-content"/> <echo message="* 7) Commit the repository jars"/> - <echo message="* 8) Write a stick post on the user forum"/> + <echo message="* 8) Write a sticky post on the user forum"/> <echo message="* 9) Release the jbossws-${version.id} version in JIRA"/> <echo message="* 10) Post a message to jbossws-announce(a)lists.jboss.org"/> <echo message="* 11) Post a message to thecore(a)jboss.org"/> @@ -35,12 +38,13 @@ </target>  - <target name="release-to-repository" depends="jars" description="Release to jboss.local.repository"> + <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" + description="Release to jboss.local.repository">  - <property name="target.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${target.dir}/lib"/> - <copy todir="${target.dir}/lib" overwrite="true"> + <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> + <mkdir dir="${jbossws.repository.dir}/lib"/> + <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> <include name="jboss-jaxrpc.jar"/> @@ -49,19 +53,41 @@ </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.jar"/> - <include name="jbossws-jboss50-integration.jar"/> + <include name="jbossws50-deployer.zip"/> </fileset> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws42.sar"/> - <include name="jbossws-jboss42-integration.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + </fileset> </copy> - <copy tofile="${target.dir}/component-info.xml" file="${build.dir}/etc/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="version.properties"/> + <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> + +  + <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> + <mkdir dir="${jbossws14.repository.dir}/lib"/> + <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> + </fileset> + </copy> + <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target>  @@ -85,7 +111,7 @@  <copy todir="${portal.downloads}" overwrite="true"> - <fileset dir="${build.dir}"> + <fileset dir="${build.output.dir}"> <include name="jbossws-${version.id}.zip"/> <include name="jbossws-src-${version.id}.zip"/> <include name="jbossws-samples-${version.id}.zip"/> @@ -103,33 +129,33 @@  <target name="build-bin-dist" description="Build the binary distribution" - depends="main,tomcat-thirdparty-jar,build-samples,build-docs"> + depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-docs"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> <mkdir dir="${build.bin.dist}/docs/html"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/> + <mkdir dir="${build.bin.dist}/lib/jboss-jdk14"/> + <mkdir dir="${build.bin.dist}/lib/jboss-jdk15"/> <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/> <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> - <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> + <copy todir="${build.bin.dist}" file="${etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> - <fileset dir="${src.dist.dir}"/> + <fileset dir="${core.resources.dir}/dist"/> <filterset> - <filtersfile file="version.properties"/> + <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> <copy todir="${build.bin.dist}/bin"> - <fileset dir="${build.etc.dir}"> + <fileset dir="${etc.dir}"> <include name="wstools.bat"/> <include name="wstools.sh"/> </fileset> </copy>  - <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> + <copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/>  <copy todir="${build.bin.dist}/docs/html" overwrite="true"> @@ -139,11 +165,39 @@ <fileset dir="${docs.userguide.dir}/build/en/pdf"/> </copy> -  - <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> +  + <copy todir="${build.bin.dist}/lib/jboss-jdk15" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> + </fileset> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws42.sar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + </fileset> </copy> +  + <copy todir="${build.bin.dist}/lib/jboss-jdk14" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> + </fileset> + </copy> +  <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> <fileset dir="${thirdparty.dir}"> @@ -158,35 +212,51 @@ <include name="log4j.jar"/> <include name="mailapi.jar"/> </fileset> - <fileset dir="${build.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> - <include name="jbossws-tomcat-integration.jar"/> - <include name="jbossws-thirdparty.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${tomcat.output.lib.dir}"> + <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws-thirdparty.jar"/> + </fileset> </copy> <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws.war"/> + <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/> </copy> - <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> + <zip destfile="${build.output.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> </target>  <target name="build-src-dist" description="Build the source distribution"> <mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/> <copy todir="${build.src.dist}/jbossws-src-${version.id}"> - <fileset dir="${basedir}"> - <include name="ant.properties.example"/> - <include name="version.properties"/> - <include name="build.xml"/> - <include name="src/**"/> - <include name="docs/user-guide/**"/> + <fileset dir="${basedir}/.."> + <include name="build/ant.properties.example"/> + <include name="build/version.properties"/> + <include name="build/build.xml"/> + <include name="build/ant-import/**"/> + <include name="build/etc/**"/> + <include name="jbossws-core/src/**"/> + <include name="jbossws-core/build.xml"/> + <include name="jbossws-docs/user-guide/**"/> + <include name="jbossws-tests/ant-import/**"/> + <include name="jbossws-tests/src/**"/> + <include name="jbossws-tests/build.xml"/> + <include name="integration-jboss50/src/**"/> + <include name="integration-jboss50/build.xml"/> + <include name="integration-jboss42/src/**"/> + <include name="integration-jboss42/build.xml"/> + <include name="integration-jboss40/src/**"/> + <include name="integration-jboss40/build.xml"/> + <include name="integration-tomcat/src/**"/> + <include name="integration-tomcat/build.xml"/> </fileset> </copy> - <zip destfile="${build.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" + <zip destfile="${build.output.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" includes="jbossws-src-${version.id}/**"/> </target> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-samples.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -19,28 +19,33 @@ <target name="build-samples" description="Builds the samples." depends="prepare"> <property name="samples.target" value="jbossws-samples-${version.id}"/> - <property name="build.src.samples.dir" value="${build.dir}/${samples.target}"/> + <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> <copy todir="${build.src.samples.dir}"> - <fileset dir="${src.samples.dir}"> + <fileset dir="${core.samples.dir}"> <include name="common/imported-build.xml"/> + <include name="common/build-thirdparty.xml"/> <include name="ant.properties.example"/> + <include name="version.properties"/> <include name="**/build.xml"/> </fileset> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> </copy> <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> - <fileset dir="${jboss.client}"> - <include name="commons-logging.jar"/> - <include name="jbossall-client.jar"/> - <include name="mail.jar"/> - <include name="jboss-aop-jdk50-client.jar"/> - <include name="jboss-aspect-jdk50-client.jar"/> - <include name="jboss-ejb3-client.jar"/> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50-integration.jar"/> </fileset> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss-integration.jar"/> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + </fileset> + <fileset dir="${tomcat.output.lib.dir}"> <include name="jbossws-tomcat-integration.jar"/> </fileset> </copy> @@ -50,18 +55,18 @@ <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/> <copy todir="${build.src.samples.dir}/common/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/*.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/common/resources"> - <fileset dir="${src.samples.dir}/common"> + <fileset dir="${core.samples.dir}/common"> <include name="jndi.properties"/> <include name="log4j.xml"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"> - <fileset dir="${test.resources.dir}/jaxrpc/samples-override"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> </copy>  @@ -69,12 +74,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/docstyle"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/docstyle"/> </copy>  @@ -82,12 +87,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/dynamichandler"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/dynamichandler"/> </copy>  @@ -95,12 +100,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/exception/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/exception"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/exception"/> </copy>  @@ -108,12 +113,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/handler/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/handler"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/handler"/> </copy>  @@ -121,12 +126,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/holder/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/holder"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/holder"/> </copy>  @@ -134,12 +139,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jmstransport"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jmstransport"/> </copy>  @@ -147,12 +152,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109ejb"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109ejb"/> </copy>  @@ -160,12 +165,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109pojo"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109pojo"/> </copy>  @@ -173,12 +178,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/message/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/message/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/message"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/message"/> </copy>  @@ -186,12 +191,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/mtom"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/mtom"/> </copy>  @@ -199,12 +204,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/oneway"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/oneway"/> </copy>  @@ -212,12 +217,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/rpcstyle"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/rpcstyle"/> </copy>  @@ -225,12 +230,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/secureejb"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/secureejb"/> </copy>  @@ -238,12 +243,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/swa/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/swa"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/swa"/> </copy>  @@ -251,12 +256,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" /> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" /> </copy>  @@ -264,12 +269,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wseventing"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wseventing"/> </copy>  @@ -277,13 +282,13 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/> <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wssecurity"> <exclude name="store-pass-encrypt/**"/> </fileset> </copy> @@ -295,12 +300,12 @@ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/> <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/jsr181ejb"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181ejb"/> </copy>  @@ -308,44 +313,47 @@ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/> <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/jsr181pojo"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181pojo"/> </copy> +  + <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> + <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> + + <copy todir="${build.src.samples.dir}/jaxws/retail/java"> + <fileset dir="${tests.java.dir}"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> + </fileset> + </copy> + <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> + <fileset dir="${tests.resources.dir}/jaxws/samples/retail"/> + </copy> +  <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/> <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/> <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/wsaddressing"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/wsaddressing"/> </copy> - -  - <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/retail/java"> - <fileset dir="${test.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> +  + <zip destfile="${build.output.dir}/${samples.target}.zip"> + <fileset dir="${build.output.dir}"> + <include name="${samples.target}/**"/> + <exclude name="${samples.target}/output/**"/> + <exclude name="${samples.target}/thirdparty/**"/> </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/retail"/> - </copy> - -  - <zip destfile="${build.dir}/${samples.target}.zip"> - <fileset dir="${build.dir}" includes="${samples.target}/**"/> </zip> </target> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -22,7 +22,8 @@ <property environment="env"/> <property name="build.dir" value="${basedir}/../build"/> - <property name="docs.dir" value="${basedir}/../docs"/> + <property name="build.output.dir" value="${build.dir}/output"/> + <property name="docs.dir" value="${basedir}/../jbossws-docs"/> <property name="integration.jboss40.dir" value="${basedir}/../integration-jboss40"/> <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> @@ -30,8 +31,8 @@ <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="tests.dir" value="${basedir}/../jbossws-tests"/> + <property name="etc.dir" value="${build.dir}/output/etc"/> <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/> - <property name="output.etc.dir" value="${build.dir}/output/etc"/> <property name="thirdparty.dir" value="${build.dir}/thirdparty"/> <property name="jboss50.lib" value="${jboss50.home}/lib"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -26,6 +26,7 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/build.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -21,6 +21,7 @@ <import file="${basedir}/../integration-jboss50/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/build.xml"/> <target name="init" depends="prepare, thirdparty"> </target> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -13,9 +13,6 @@ <artifact id="jbossws50.sar"/> <artifact id="jbossws50-deployer.zip"/> <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-jboss42-integration.jar"/> - <artifact id="jbossws-jboss50-integration.jar"/> - <artifact id="jbossws-tomcat-integration.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/version.properties 2007-01-05 16:10:17 UTC (rev 1825) @@ -25,6 +25,7 @@ # thirdparty library versions apache-ant=1.6.5 apache-log4j=1.2.8 +apache-logging=1.0.5.GA-jboss apache-xalan=j_2.7.0 apache-xerces=2.7.1 hibernate=3.2.0.CR2

17 years, 12 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2007