September 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4592 - container/jboss42/tags.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-19 13:58:53 -0400 (Wed, 19 Sep 2007) New Revision: 4592 Removed: container/jboss42/tags/jbossws-jboss42-2.0.0.GA_SP1/ Log: discard the service pack approach

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4591 - spi/tags.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-19 13:57:49 -0400 (Wed, 19 Sep 2007) New Revision: 4591 Removed: spi/tags/jbossws-spi-1.0.0.GA_SP1/ Log: discard the service pack approach

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4590 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws251.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 08:52:47 -0400 (Wed, 19 Sep 2007) New Revision: 4590 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java Log: javadoc Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-09-19 12:43:59 UTC (rev 4589) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-09-19 12:52:47 UTC (rev 4590) @@ -32,7 +32,7 @@ /** - * Test mapping of primitive types in jaxrpc-mapping.xml + * SOAP fault inheritance * * http://jira.jboss.com/jira/browse/JBWS-251 *

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4589 - stack/cxf/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 08:43:59 -0400 (Wed, 19 Sep 2007) New Revision: 4589 Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml Log: Build CXF if repository has new commits Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:36:19 UTC (rev 4588) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:43:59 UTC (rev 4589) @@ -42,7 +42,7 @@  - <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty.get" + <target name="thirdparty-get" depends="thirdparty-init, cxf-copy-jars" if="force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> @@ -68,8 +68,6 @@ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <antcall target="cxf-copy-jars"/> - <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> @@ -142,6 +140,7 @@  <target name="cxf-copy-jars" depends="cxf-maven-build"> + <mkdir dir="${thirdparty.dir}"/> <copy todir="${thirdparty.dir}"> <fileset dir="${apache.cxf.dir}/distribution/target/apache-cxf-${cxf.version}.dir/apache-cxf-${cxf.version}/lib"> <include name="cxf-${cxf.version}.jar"/>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4588 - in stack/metro/trunk: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 08:36:19 -0400 (Wed, 19 Sep 2007) New Revision: 4588 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/src/main/etc/component-info50.xml Log: Remove dependency on jbossws-jboss50.jar Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2007-09-19 12:18:43 UTC (rev 4587) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2007-09-19 12:36:19 UTC (rev 4588) @@ -101,8 +101,6 @@ <include name="jbossws-sunri50.sar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss42.jar"/> <include name="FastInfoset.jar"/> <include name="http.jar"/> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:18:43 UTC (rev 4587) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:36:19 UTC (rev 4588) @@ -48,8 +48,6 @@ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" 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-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/metro/trunk/src/main/etc/component-info50.xml 2007-09-19 12:18:43 UTC (rev 4587) +++ stack/metro/trunk/src/main/etc/component-info50.xml 2007-09-19 12:36:19 UTC (rev 4588) @@ -11,9 +11,6 @@ <import componentref="jboss/microcontainer"> <compatible version="@jboss-microcontainer@"/> </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version="@repository.id@"/> - </import> <import componentref="jboss/jbossws-spi"> <compatible version="@repository.id@"/> </import>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4587 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 08:18:43 -0400 (Wed, 19 Sep 2007) New Revision: 4587 Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-thirdparty.xml Log: Remove dependency on jbossws-jboss50.jar Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-19 12:17:58 UTC (rev 4586) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-09-19 12:18:43 UTC (rev 4587) @@ -92,8 +92,6 @@ <include name="jbossws-framework.jar"/> <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss42.jar"/> <include name="jbossws-jboss40.jar"/> </fileset> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:17:58 UTC (rev 4586) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:18:43 UTC (rev 4587) @@ -59,9 +59,6 @@ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/> <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-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4586 - in stack/cxf/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 08:17:58 -0400 (Wed, 19 Sep 2007) New Revision: 4586 Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/src/main/etc/component-info50.xml Log: Fix binary dist Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-09-19 11:35:21 UTC (rev 4585) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-09-19 12:17:58 UTC (rev 4586) @@ -100,25 +100,23 @@ <include name="jbossws-xfire50.sar"/> </fileset> <fileset dir="${thirdparty.dir}"> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss42.jar"/> <include name="juddi-service.sar"/> - <include name="cxf-incubator.jar"/> - <include name="geronimo-javamail.jar"/> - <include name="geronimo-ws-metadata.jar"/> + <include name="cxf-${cxf.version}.jar"/> + <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="jdom-${cxf.jdom}.jar"/> + <include name="neethi-${cxf.neethi}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> + <include name="saaj-impl-${cxf.saaj}.jar"/> + <include name="xml-resolver-${cxf.xml.resolver}.jar"/> + <include name="XmlSchema-${cxf.xmlschema}.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> - <include name="jaxws-api.jar"/> - <include name="jdom.jar"/> - <include name="neethi.jar"/> - <include name="resolver.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="wsdl4j.jar"/> - <include name="wstx.jar"/> - <include name="XmlSchema.jar"/> + <include name="wsdl4j.jar"/> + <include name="wstx.jar"/> </fileset> </copy> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-19 11:35:21 UTC (rev 4585) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-09-19 12:17:58 UTC (rev 4586) @@ -52,8 +52,6 @@ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.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"/> Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-09-19 11:35:21 UTC (rev 4585) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-09-19 12:17:58 UTC (rev 4586) @@ -12,140 +12,140 @@  <project default="main" basedir="." name="JBossWS-xfire"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="bin.dir" value="${basedir}/bin"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${basedir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> +  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/macros-deploy-framework.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/macros-deploy-framework.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> <pathelement location="${lib.dir}/jbossws-common.jar"/> <pathelement location="${lib.dir}/jbossws-spi.jar"/> - <pathelement location="${lib.dir}/cxf-incubator.jar"/> - <pathelement location="${lib.dir}/geronimo-javamail.jar"/> - <pathelement location="${lib.dir}/geronimo-ws-metadata.jar"/> + <pathelement location="${lib.dir}/cxf-${cxf.version}.jar"/> + <pathelement location="${lib.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${lib.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${lib.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${lib.dir}/jdom-${cxf.jdom}.jar"/> + <pathelement location="${lib.dir}/neethi-${cxf.neethi}.jar"/> + <pathelement location="${lib.dir}/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${lib.dir}/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${lib.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${lib.dir}/XmlSchema-${cxf.xmlschema}.jar"/> <pathelement location="${lib.dir}/jaxb-api.jar"/> - <pathelement location="${lib.dir}/jaxws-api.jar"/> - <pathelement location="${lib.dir}/jdom.jar"/> - <pathelement location="${lib.dir}/neethi.jar"/> - <pathelement location="${lib.dir}/resolver.jar"/> - <pathelement location="${lib.dir}/saaj-api.jar"/> - <pathelement location="${lib.dir}/saaj-impl.jar"/> <pathelement location="${lib.dir}/wsdl4j.jar"/> <pathelement location="${lib.dir}/wstx.jar"/> - <pathelement location="${lib.dir}/XmlSchema.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> +  - <target name="jars-jboss50" depends="prepare"/> - <target name="jars-jboss42" depends="prepare"/> + <target name="jars-jboss50" depends="prepare"/> + <target name="jars-jboss42" depends="prepare"/> -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> \ No newline at end of file Modified: stack/cxf/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/cxf/trunk/src/main/etc/component-info50.xml 2007-09-19 11:35:21 UTC (rev 4585) +++ stack/cxf/trunk/src/main/etc/component-info50.xml 2007-09-19 12:17:58 UTC (rev 4586) @@ -11,9 +11,6 @@ <import componentref="jboss/microcontainer"> <compatible version="@jboss-microcontainer@"/> </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version="@repository.id@"/> - </import> <import componentref="jboss/jbossws-spi"> <compatible version="@repository.id@"/> </import>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4585 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-19 07:35:21 -0400 (Wed, 19 Sep 2007) New Revision: 4585 Modified: stack/cxf/trunk/version.properties Log: cxf.neethi=2.0.2 Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-09-18 16:03:30 UTC (rev 4584) +++ stack/cxf/trunk/version.properties 2007-09-19 11:35:21 UTC (rev 4585) @@ -23,7 +23,7 @@ cxf.geronimo.ws.metadata=2.0_spec-1.1.1 cxf.jaxws.api=2.0 cxf.jdom=1.0 -cxf.neethi=2.0 +cxf.neethi=2.0.2 cxf.saaj=1.3 cxf.spring=2.0.4 cxf.xbean=2.2.0

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4584 - in stack/native/branches/ropalka/trunk/src/main: resources/schema and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-18 12:03:30 -0400 (Tue, 18 Sep 2007) New Revision: 4584 Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd Log: wsrm config will be part of jaxws configs Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-09-18 13:15:44 UTC (rev 4583) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-09-18 16:03:30 UTC (rev 4584) @@ -48,6 +48,7 @@ { registerEntity("urn:jboss:jaxrpc-config:2.0", "schema/jaxrpc-config_2_0.xsd"); registerEntity("urn:jboss:jaxws-config:2.0", "schema/jaxws-config_2_0.xsd"); + registerEntity("http://www.jboss.com/ws-rm/config", "schema/jboss-ws-rm_1.0.xsd"); registerEntity("http://java.sun.com/xml/ns/javaee", "schema/javaee_web_services_1_2.xsd"); registerEntity("http://www.w3.org/2005/08/addressing", "schema/ws-addr.xsd"); registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing", "eventing.xsd"); Modified: stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd =================================================================== --- stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-09-18 13:15:44 UTC (rev 4583) +++ stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-09-18 16:03:30 UTC (rev 4584) @@ -3,10 +3,12 @@ <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:jaxws-config:2.0" xmlns:tns="urn:jboss:jaxws-config:2.0" - xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:wsrm="http://www.jboss.com/ws-rm/config" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1"> + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.1"> <xsd:annotation> <xsd:documentation> @@ -19,6 +21,8 @@ <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_web_services_1_2.xsd"/> + <xsd:import namespace="http://www.jboss.com/ws-rm/config" schemaLocation="jboss-ws-rm_1.0.xsd"/> + <xsd:element name="jaxws-config" type="tns:jaxwsConfigType"/> <xsd:complexType name="jaxwsConfigType"> <xsd:choice> @@ -33,7 +37,6 @@ </xsd:complexContent> </xsd:complexType> -  <xsd:complexType name="clientConfigType"> <xsd:complexContent> <xsd:extension base="tns:commonConfigType"/> @@ -43,6 +46,7 @@ <xsd:complexType name="commonConfigType"> <xsd:sequence> <xsd:element name="config-name" type="xsd:string"/> + <xsd:element name="reliable-messaging" type="wsrm:rmConfigType" minOccurs="0"/> <xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> <xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> @@ -51,13 +55,6 @@ </xsd:complexType> <xsd:complexType name="propertyType"> - <xsd:annotation> - <xsd:documentation> - - A property models name value pairs. - - </xsd:documentation> - </xsd:annotation> <xsd:sequence> <xsd:element name="property-name" type="xsd:anyURI"/> <xsd:element name="property-value" type="xsd:string"/> Modified: stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd =================================================================== --- stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-18 13:15:44 UTC (rev 4583) +++ stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-18 16:03:30 UTC (rev 4584) @@ -1,51 +1,44 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.jboss.com/ws-rm/config" targetNamespace="http://www.jboss.com/ws-rm/config" elementFormDefault="qualified"> - <xs:element name="jboss-ws-rm"> - <xs:annotation> - <xs:documentation> - This WS-RM configuration file will be used on both client and server sides. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element name="delivery-assurance" type="deliveryAssuranceType" minOccurs="0"> - <xs:annotation> - <xs:documentation> - Global WS-RM delivery assurance configuration that applies to all WSDL ports. - If there is the WS-Policy with attached WS-RM assertion in WSDL - associated with some port or its associated binding it - will always override this global configuration. - </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="provider" type="providerType"> - <xs:annotation> - <xs:documentation> - WS-RM specification version to be used for reliable messaging. - </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="message-store" type="msgStoreType"> - <xs:annotation> - <xs:documentation> - WS-RM message store to be used for reliable messaging. - </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="port" type="portType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation> - WSDL port specific WS-RM delivery assurance configuration. - </xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> + <xs:complexType name="rmConfigType"> + <xs:sequence> + <xs:element name="delivery-assurance" type="deliveryAssuranceType" minOccurs="0"> + <xs:annotation> + <xs:documentation> + Global WS-RM delivery assurance configuration that applies to all WSDL ports. + If there is the WS-Policy with attached WS-RM assertion in WSDL + associated with some port or its associated binding it + will always override this global configuration. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="provider" type="providerType"> + <xs:annotation> + <xs:documentation> + WS-RM specification version to be used for reliable messaging. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="message-store" type="msgStoreType"> + <xs:annotation> + <xs:documentation> + WS-RM message store to be used for reliable messaging. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="port" type="portType" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + WSDL port specific WS-RM delivery assurance configuration. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> <xs:complexType name="msgStoreType"> <xs:sequence> <xs:element name="config-file" type="xs:string"> @@ -139,4 +132,4 @@ </xs:annotation> </xs:attribute> </xs:complexType> -</xs:schema> \ No newline at end of file +</xs:schema>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4583 - in stack/native/trunk/src/main/java: org/jboss/ws/core/soap and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-09-18 09:15:44 -0400 (Tue, 18 Sep 2007) New Revision: 4583 Added: stack/native/trunk/src/main/java/javax/xml/soap/SAAJFactoryLoader.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/soap/SAAJFactoryLoader.java Modified: stack/native/trunk/src/main/java/javax/xml/soap/MessageFactory.java stack/native/trunk/src/main/java/javax/xml/soap/SAAJMetaFactory.java stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java Log: Rollback -r4525 Fix JBCTS-312: javax.xml.soap.sig_1.3.javaee Modified: stack/native/trunk/src/main/java/javax/xml/soap/MessageFactory.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/MessageFactory.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/javax/xml/soap/MessageFactory.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Method; /** A factory for creating SOAPMessage objects. @@ -71,12 +70,9 @@ try { String propertyName = "javax.xml.soap.MessageFactory"; - - Class loaderClass = Class.forName("org.jboss.ws.soap.SAAJFactoryLoader"); - Method m = loaderClass.getMethod("loadFactory", new Class[] {String.class, String.class}); - factory = (MessageFactory)m.invoke(null, new Object[] {propertyName, null}); + factory = (MessageFactory)SAAJFactoryLoader.loadFactory(propertyName, null); } - catch (Exception rte) + catch (RuntimeException rte) { throw new SOAPException(rte); } Copied: stack/native/trunk/src/main/java/javax/xml/soap/SAAJFactoryLoader.java (from rev 4510, stack/native/trunk/src/main/java/javax/xml/soap/SAAJFactoryLoader.java) =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/SAAJFactoryLoader.java (rev 0) +++ stack/native/trunk/src/main/java/javax/xml/soap/SAAJFactoryLoader.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -0,0 +1,194 @@ +/* + * 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 javax.xml.soap; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Properties; + + +// $Id$ + +/** + * Load a factory using this ordered lookup procedure + * + * <ol> + * <li>Use the system property + * <li>Use the properties file "lib/jaxm.properties" in the JRE directory + * <li>Use the Services API (as detailed in the JAR specification), if available, to determine the classname + * <li>Use the default factory implementation class + * </ol> + * + * @author Thomas.Diesler(a)jboss.com + * @since 14-Dec-2006 + */ +class SAAJFactoryLoader +{ + private SAAJFactoryLoader() + { + } + + /** + * + * @return the factory impl, or null + */ + public static Object loadFactory(String propertyName, String defaultFactory) + { + Object factory = null; + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + + // Use the system property + PrivilegedAction action = new PropertyAccessAction(propertyName); + String factoryName = (String)AccessController.doPrivileged(action); + if (factoryName != null) + { + try + { + //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + + // Use the properties file "lib/jaxm.properties" in the JRE directory. + // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above. + if (factory == null) + { + action = new PropertyAccessAction("java.home"); + String javaHome = (String)AccessController.doPrivileged(action); + File jaxmFile = new File(javaHome + "/lib/jaxm.properties"); + if (jaxmFile.exists()) + { + try + { + action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath()); + Properties jaxmProperties = (Properties)AccessController.doPrivileged(action); + factoryName = jaxmProperties.getProperty(propertyName); + if (factoryName != null) + { + //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + } + + // Use the Services API (as detailed in the JAR specification), if available, to determine the classname. + if (factory == null) + { + String filename = "META-INF/services/" + propertyName; + InputStream inStream = loader.getResourceAsStream(filename); + if (inStream != null) + { + try + { + BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8")); + factoryName = br.readLine(); + br.close(); + if (factoryName != null) + { + //if(log.isTraceEnabled()) log.trace("Load from Service API " + filename + ": " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + } + + // Use the default factory implementation class. + if (factory == null && defaultFactory != null) + { + try + { + factoryName = defaultFactory; + //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName); + Class factoryClass = loader.loadClass(factoryName); + factory = factoryClass.newInstance(); + } + catch (Throwable t) + { + throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); + } + } + + return factory; + } + + private static class PropertyAccessAction implements PrivilegedAction + { + private String name; + + PropertyAccessAction(String name) + { + this.name = name; + } + + public Object run() + { + return System.getProperty(name); + } + } + + private static class PropertyFileAccessAction implements PrivilegedAction + { + private String filename; + + PropertyFileAccessAction(String filename) + { + this.filename = filename; + } + + public Object run() + { + try + { + InputStream inStream = new FileInputStream(filename); + Properties props = new Properties(); + props.load(inStream); + return props; + } + catch (IOException ex) + { + throw new SecurityException("Cannot load properties: " + filename, ex); + } + } + } +} Modified: stack/native/trunk/src/main/java/javax/xml/soap/SAAJMetaFactory.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/SAAJMetaFactory.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/javax/xml/soap/SAAJMetaFactory.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -21,8 +21,6 @@ */ package javax.xml.soap; -import java.lang.reflect.Method; - // $Id$ /** @@ -59,19 +57,8 @@ { String propertyName = "javax.xml.soap.MetaFactory"; String defaultImpl = "org.jboss.ws.core.soap.SAAJMetaFactoryImpl"; - - SAAJMetaFactory factory = null; - try - { - Class loaderClass = Class.forName("org.jboss.ws.soap.SAAJFactoryLoader"); - Method m = loaderClass.getMethod("loadFactory", new Class[] {String.class, String.class}); - factory = (SAAJMetaFactory)m.invoke(null, new Object[] {propertyName, defaultImpl}); - } - catch (Exception e) - { - throw new SOAPException("Failed to load org.jboss.ws.soap.SAAJFactoryLoader", e); - } - + SAAJMetaFactory factory = (SAAJMetaFactory)SAAJFactoryLoader.loadFactory(propertyName, defaultImpl); + if (factory == null) throw new SOAPException("Failed to to determine the implementation class for: " + propertyName); Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -21,6 +21,8 @@ */ package javax.xml.soap; +import org.jboss.util.NotImplementedException; + /** A point-to-point connection that a client can use for sending messages directly to a remote * party (represented by a URL, for instance). * @@ -61,10 +63,7 @@ * @throws SOAPException if there is a SOAP error * @since SAAJ 1.3 */ - public SOAPMessage get(Object to) throws SOAPException - { - throw new IllegalArgumentException("Should be implemented by concrete implementation of this class"); - } + public abstract SOAPMessage get(Object to) throws SOAPException; /** Closes this SOAPConnection object. * Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -23,11 +23,10 @@ // $Id$ -import org.w3c.dom.Element; - import javax.xml.namespace.QName; -import java.lang.reflect.Method; +import org.w3c.dom.Element; + /** SOAPFactory is a factory for creating various objects that exist in the SOAP XML tree. * * SOAPFactory can be used to create XML fragments that will eventually end up in the SOAP part. @@ -62,12 +61,9 @@ try { String propertyName = "javax.xml.soap.SOAPFactory"; - - Class loaderClass = Class.forName("org.jboss.ws.soap.SAAJFactoryLoader"); - Method m = loaderClass.getMethod("loadFactory", new Class[] {String.class, String.class}); - soapFactory = (SOAPFactory)m.invoke(null, new Object[] {propertyName, null}); + soapFactory = (SOAPFactory)SAAJFactoryLoader.loadFactory(propertyName, null); } - catch (Exception rte) + catch (RuntimeException rte) { throw new SOAPException(rte); } @@ -125,10 +121,7 @@ * @throws SOAPException if there is an error in creating the SOAPElement object * @since SAAJ 1.3 */ - public SOAPElement createElement(Element domElement) throws SOAPException - { - throw new IllegalArgumentException("Should be implemented by concrete implementation of this class"); - } + public abstract SOAPElement createElement(Element domElement) throws SOAPException; /** Create a SOAPElement object initialized with the given local name. * @@ -166,10 +159,7 @@ * @throws SOAPException if there is an error in creating the SOAPElement object * @since SAAJ 1.3 */ - public SOAPElement createElement(QName qname) throws SOAPException - { - throw new IllegalArgumentException("Should be implemented by concrete implementation of this class"); - } + public abstract SOAPElement createElement(QName qname) throws SOAPException; /** * Creates a new SOAPFault object initialized with the given reasonText and faultCode Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -82,7 +82,7 @@ * @throws UnsupportedOperationException if this message does not support the SOAP 1.2 concept of Fault Role * @since SAAJ 1.3 */ - public void setRole(String roleURI) throws SOAPException; + public void setRole(String roleURI); /** Sets the actor associated with this SOAPHeaderElement object to the specified actor. * The default value of an actor is: SOAPConstants.URI_SOAP_ACTOR_NEXT Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -77,7 +77,7 @@ return roleAttr != null ? roleAttr.getValue() : null; } - public void setRole(String roleURI) throws SOAPException + public void setRole(String roleURI) { final SOAPElement header = getParentElement(); final String headerURI = header.getNamespaceURI(); @@ -128,16 +128,7 @@ if (Constants.NS_SOAP11_ENV.equals(headerURI)) setAttributeNS(headerURI, header.getPrefix() + ":" + Constants.SOAP11_ATTR_ACTOR, actorURI); else - { - try - { - setRole(actorURI); - } - catch (SOAPException e) - { - throw new IllegalArgumentException("Failed to setRole: " + actorURI, e); - } - } + setRole(actorURI); } public boolean getMustUnderstand() Deleted: stack/native/trunk/src/main/java/org/jboss/ws/soap/SAAJFactoryLoader.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/soap/SAAJFactoryLoader.java 2007-09-18 10:43:43 UTC (rev 4582) +++ stack/native/trunk/src/main/java/org/jboss/ws/soap/SAAJFactoryLoader.java 2007-09-18 13:15:44 UTC (rev 4583) @@ -1,194 +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.soap; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Properties; - - -// $Id$ - -/** - * Load a factory using this ordered lookup procedure - * - * <ol> - * <li>Use the system property - * <li>Use the properties file "lib/jaxm.properties" in the JRE directory - * <li>Use the Services API (as detailed in the JAR specification), if available, to determine the classname - * <li>Use the default factory implementation class - * </ol> - * - * @author Thomas.Diesler(a)jboss.com - * @since 14-Dec-2006 - */ -public class SAAJFactoryLoader -{ - private SAAJFactoryLoader() - { - } - - /** - * - * @return the factory impl, or null - */ - public static Object loadFactory(String propertyName, String defaultFactory) - { - Object factory = null; - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - - // Use the system property - PrivilegedAction action = new PropertyAccessAction(propertyName); - String factoryName = (String)AccessController.doPrivileged(action); - if (factoryName != null) - { - try - { - //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName); - Class factoryClass = loader.loadClass(factoryName); - factory = factoryClass.newInstance(); - } - catch (Throwable t) - { - throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); - } - } - - // Use the properties file "lib/jaxm.properties" in the JRE directory. - // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above. - if (factory == null) - { - action = new PropertyAccessAction("java.home"); - String javaHome = (String)AccessController.doPrivileged(action); - File jaxmFile = new File(javaHome + "/lib/jaxm.properties"); - if (jaxmFile.exists()) - { - try - { - action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath()); - Properties jaxmProperties = (Properties)AccessController.doPrivileged(action); - factoryName = jaxmProperties.getProperty(propertyName); - if (factoryName != null) - { - //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName); - Class factoryClass = loader.loadClass(factoryName); - factory = factoryClass.newInstance(); - } - } - catch (Throwable t) - { - throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); - } - } - } - - // Use the Services API (as detailed in the JAR specification), if available, to determine the classname. - if (factory == null) - { - String filename = "META-INF/services/" + propertyName; - InputStream inStream = loader.getResourceAsStream(filename); - if (inStream != null) - { - try - { - BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8")); - factoryName = br.readLine(); - br.close(); - if (factoryName != null) - { - //if(log.isTraceEnabled()) log.trace("Load from Service API " + filename + ": " + factoryName); - Class factoryClass = loader.loadClass(factoryName); - factory = factoryClass.newInstance(); - } - } - catch (Throwable t) - { - throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); - } - } - } - - // Use the default factory implementation class. - if (factory == null && defaultFactory != null) - { - try - { - factoryName = defaultFactory; - //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName); - Class factoryClass = loader.loadClass(factoryName); - factory = factoryClass.newInstance(); - } - catch (Throwable t) - { - throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t); - } - } - - return factory; - } - - private static class PropertyAccessAction implements PrivilegedAction - { - private String name; - - PropertyAccessAction(String name) - { - this.name = name; - } - - public Object run() - { - return System.getProperty(name); - } - } - - private static class PropertyFileAccessAction implements PrivilegedAction - { - private String filename; - - PropertyFileAccessAction(String filename) - { - this.filename = filename; - } - - public Object run() - { - try - { - InputStream inStream = new FileInputStream(filename); - Properties props = new Properties(); - props.load(inStream); - return props; - } - catch (IOException ex) - { - throw new SecurityException("Cannot load properties: " + filename, ex); - } - } - } -}

16 years, 7 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 September 2007