September 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4643 - container/jboss40/branches/ropalka/trunk/src/main/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:45:56 -0400 (Fri, 28 Sep 2007) New Revision: 4643 Added: container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml Log: [JBWS-1796] reparing the JBoss AS 4.0 no EJB3 integration Added: container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml =================================================================== --- container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml (rev 0) +++ container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml 2007-09-28 07:45:56 UTC (rev 4643) @@ -0,0 +1,266 @@ + +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss40.DeploymentAspectHttpServer"/> + +  + +  +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss40.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> +  + <bean name="WSDeployerHook_JAXWS_JSE2" class="org.jboss.wsf.container.jboss40.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss40.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss40.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss40.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ContainerMetaDataAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss40.SecurityHandlerEJB21"/> + <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss40.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss40.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss40.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + +  + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Property changes on: container/jboss40/branches/ropalka/trunk/src/main/resources/jbossws-jboss40-config-no-ejb3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4642 - stack/native/branches/ropalka/trunk and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-28 03:44:00 -0400 (Fri, 28 Sep 2007) New Revision: 4642 Added: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt Modified: framework/trunk/src/test/ant-import/build-testsuite.xml stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml stack/native/branches/ropalka/trunk/ant.properties.example stack/native/branches/ropalka/trunk/build.xml Log: [JBWS-1796] reparing the JBoss AS 4.0 no EJB3 integration Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -20,6 +20,9 @@ <condition property="jboss.home" value="${jboss40.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40.no.ejb3"/> + </condition>   @@ -103,7 +106,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40"/> + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40,tests-classpath-jboss40-no-ejb3"/> <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> @@ -269,6 +272,52 @@ </path> </target> + <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss40.no.ejb3"> + <path id="tests.javac.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-common-client.jar"/> + <pathelement location="${jboss.client}/jboss-j2ee.jar"/> + <pathelement location="${jboss.client}/jboss-remoting.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/stax-api.jar"/> + <pathelement location="${jboss.client}/jbosssx-client.jar"/> + <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> + </path> + +  + <path id="tests.client.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${jboss.client}/commons-logging.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jaxb-xjc.jar"/> + <pathelement location="${jboss.client}/jboss-saaj.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/stax-api.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> +  + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> + <pathelement location="${tools.jar}"/> + </path> + </target> +    Modified: stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant-import/build-deploy.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -97,13 +97,7 @@ </target> <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> - <macro-setup-native40-no-ejb3/> - <echo> - *********************************** - * JBossWS EJB3 support disabled * - * All EJB3 tests will fail. * - *********************************** - </echo> + <macro-setup-native40-no-ejb3/> </target>  Modified: stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant-import/macros-deploy-native.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -282,6 +282,7 @@ </fileset> </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> Modified: stack/native/branches/ropalka/trunk/ant.properties.example =================================================================== --- stack/native/branches/ropalka/trunk/ant.properties.example 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/ant.properties.example 2007-09-28 07:44:00 UTC (rev 4642) @@ -6,9 +6,10 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA #jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40] +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|jboss40.no.ejb3] jbossws.integration.target=jboss50 # The JBoss server instance Modified: stack/native/branches/ropalka/trunk/build.xml =================================================================== --- stack/native/branches/ropalka/trunk/build.xml 2007-09-27 18:27:22 UTC (rev 4641) +++ stack/native/branches/ropalka/trunk/build.xml 2007-09-28 07:44:00 UTC (rev 4642) @@ -310,6 +310,18 @@ </footer> </concat> +  + <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> + <header trimleading="yes"> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${core.output.dir}/resources/jbossws-jboss40-config-no-ejb3.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> +  <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> @@ -334,6 +346,7 @@ </fileset> <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF"> <include name="jboss-service.xml"/> + <include name="jboss-service-no-ejb3.xml"/> </metainf> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> Added: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt (rev 0) +++ stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-09-28 07:44:00 UTC (rev 4642) @@ -0,0 +1,48 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# EJB3 compilation excludes +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/context/EndpointEJB* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/swaref/** +org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/serviceref/*EJB* +org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1446/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1556/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws771/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/handlerlifecycle/** + +# EJB3 runtime excludes +org/jboss/test/ws/interop/wsa/AddressingTestCase* +org/jboss/test/ws/interop/wsse/EncryptTestCase* +org/jboss/test/ws/interop/wsse/SignTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase* +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase* +org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase* +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase* +org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase* +org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase* +org/jboss/test/ws/jaxws/wseventing/EventingTestCase* +org/jboss/test/ws/jaxws/wseventing/NotificationTestCase* +org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase* +org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase* +org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase* Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4640 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-27 06:59:25 -0400 (Thu, 27 Sep 2007) New Revision: 4640 Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java Log: adding toString() Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java 2007-09-27 10:58:48 UTC (rev 4639) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java 2007-09-27 10:59:25 UTC (rev 4640) @@ -58,4 +58,9 @@ return this.inOrder; } + public final String toString() + { + return "inOrder=\"" + this.inOrder + "\", quality=\"" + this.quality + "\""; + } + } Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java 2007-09-27 10:58:48 UTC (rev 4639) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java 2007-09-27 10:59:25 UTC (rev 4640) @@ -60,4 +60,9 @@ return this.deliveryAssurance; } + public final String toString() + { + return "portName=\"" + this.portName + "\", deliveryAssurance={" + this.deliveryAssurance + "}"; + } + }

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4639 - in stack/native/branches/ropalka/trunk: src/main/java/org/jboss/ws/extensions/policy/deployer and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-27 06:58:48 -0400 (Thu, 27 Sep 2007) New Revision: 4639 Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java Modified: stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java Log: adding initial WS-RM Policy deployer Modified: stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-27 10:54:30 UTC (rev 4638) +++ stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-27 10:58:48 UTC (rev 4639) @@ -485,11 +485,17 @@ <include name="org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF"> - <include name="jboss-wsrm-server.xml"/> - <include name="wsrm11_exactly_one_in_order.xml"/> + <include name="wsrm-exactly-once-in-order-policy.xml"/> + <include name="wsrm-jaxws-endpoint-config.xml"/> </webinf> </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-wsrm-client.jar"> + <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF"> + <include name="wsrm-jaxws-client-config.xml"/> + </metainf> + </jar> +  <antcall target="build-interop-jars"/> Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-09-27 10:54:30 UTC (rev 4638) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-09-27 10:58:48 UTC (rev 4639) @@ -39,6 +39,7 @@ import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternativeException; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicyException; +import org.jboss.ws.extensions.wsrm.policy.WSRMPolicyAssertionDeployer; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; /** @@ -56,8 +57,7 @@ { me = new PolicyDeployer(); me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", WSSecurityAssertionDeployer.class); - me.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", NopAssertionDeployer.class); - me.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200702", NopAssertionDeployer.class); + me.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200702", WSRMPolicyAssertionDeployer.class); } //hide constructor @@ -84,7 +84,6 @@ { PolicyDeployer instance = new PolicyDeployer(); instance.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", NopAssertionDeployer.class); - instance.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", NopAssertionDeployer.class); instance.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200702", NopAssertionDeployer.class); return instance; Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java =================================================================== --- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java (rev 0) +++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java 2007-09-27 10:58:48 UTC (rev 4639) @@ -0,0 +1,173 @@ +/* + * 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.extensions.wsrm.policy; + +import java.util.LinkedList; +import java.util.List; + +import javax.xml.namespace.QName; + +import org.apache.ws.policy.AndCompositeAssertion; +import org.apache.ws.policy.Policy; +import org.apache.ws.policy.PrimitiveAssertion; +import org.apache.ws.policy.XorCompositeAssertion; +import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer; +import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertionException; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ExtensibleMetaData; +import org.jboss.ws.metadata.wsrm.DeliveryAssuranceMetaData; +import org.jboss.ws.metadata.wsrm.PortMetaData; +import org.jboss.ws.metadata.wsrm.ReliableMessagingMetaData; + +/** + * Reliable messaging policy deployer + * + * @author richard.opalka(a)jboss.com + */ +public final class WSRMPolicyAssertionDeployer implements AssertionDeployer +{ + + private static final String WSRMP_NS = "http://docs.oasis-open.org/ws-rx/wsrmp/200702"; + private static final QName EXACTLY_ONCE = new QName(WSRMP_NS, "ExactlyOnce"); + private static final QName AT_LEAST_ONCE = new QName(WSRMP_NS, "AtLeastOnce"); + private static final QName AT_MOST_ONCE = new QName(WSRMP_NS, "AtMostOnce"); + private static final QName IN_ORDER = new QName(WSRMP_NS, "InOrder"); + private static final String FALSE = "false"; + private static final String TRUE = "true"; + + /* + * @see org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer#deployClientSide(org.apache.ws.policy.PrimitiveAssertion, org.jboss.ws.metadata.umdm.ExtensibleMetaData) + */ + public void deployClientSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) + throws UnsupportedAssertionException + { + deploy(assertion, extMetaData); + } + + /* + * @see org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer#deployServerSide(org.apache.ws.policy.PrimitiveAssertion, org.jboss.ws.metadata.umdm.ExtensibleMetaData) + */ + public void deployServerSide(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertionException + { + deploy(assertion, extMetaData); + } + + private static void deploy(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) + throws UnsupportedAssertionException + { + if (extMetaData instanceof EndpointMetaData) + { + EndpointMetaData endpointMD = (EndpointMetaData) extMetaData; + + // prepare wsrm metadata + ReliableMessagingMetaData wsrmMD = endpointMD.getConfig().getReliableMessaging(); + if (wsrmMD == null) + { + wsrmMD = new ReliableMessagingMetaData(); + } + + // construct new port metadata + PortMetaData portMD = new PortMetaData(); + portMD.setPortName(endpointMD.getPortName()); + List<PrimitiveAssertion> wsrmpAssertions = getWSRMPAssertions(assertion); + portMD.setDeliveryAssurance(constructDeliveryAssurance(wsrmpAssertions)); + + // ensure port does not exists yet + for (PortMetaData pMD : wsrmMD.getPorts()) + { + assert ! pMD.getPortName().equals(portMD.getPortName()); + } + + // set up port WSRMP metadata + wsrmMD.getPorts().add(portMD); + } + } + + private static DeliveryAssuranceMetaData constructDeliveryAssurance(List<PrimitiveAssertion> assertions) + throws UnsupportedAssertionException + { + if (assertions.size() == 1) + { + QName assertionQN = assertions.get(0).getName(); + assertIsWSRMPAssertion(assertionQN); + + DeliveryAssuranceMetaData deliveryMD = new DeliveryAssuranceMetaData(); + deliveryMD.setInOrder(FALSE); + deliveryMD.setQuality(assertionQN.getLocalPart()); + return deliveryMD; + } + if (assertions.size() == 2) + { + QName firstAssertionQN = assertions.get(0).getName(); + assertIsWSRMPAssertion(firstAssertionQN); + QName secondAssertionQN = assertions.get(1).getName(); + assertIsWSRMPAssertion(secondAssertionQN); + + boolean firstIsInOrder = firstAssertionQN.equals(IN_ORDER); + + DeliveryAssuranceMetaData deliveryMD = new DeliveryAssuranceMetaData(); + deliveryMD.setInOrder(TRUE); + if (firstIsInOrder) + { + deliveryMD.setQuality(secondAssertionQN.getLocalPart()); + } + else + { + deliveryMD.setQuality(firstAssertionQN.getLocalPart()); + } + + return deliveryMD; + } + + throw new IllegalArgumentException(); + } + + private static void assertIsWSRMPAssertion(QName assertionQN) throws UnsupportedAssertionException + { + if (assertionQN.equals(EXACTLY_ONCE) + || assertionQN.equals(AT_LEAST_ONCE) + || assertionQN.equals(AT_MOST_ONCE) + || assertionQN.equals(IN_ORDER)) + { + return; // recognized assertion - silently return + } + + throw new UnsupportedAssertionException(); + } + + private static List<PrimitiveAssertion> getWSRMPAssertions(PrimitiveAssertion assertion) + { + Policy policy = (Policy)assertion.getTerms().get(0); + XorCompositeAssertion xor = (XorCompositeAssertion)policy.getTerms().get(0); + AndCompositeAssertion and = (AndCompositeAssertion)xor.getTerms().get(0); + List<?> primitiveAssertions = and.getTerms(); + + List<PrimitiveAssertion> retVal = new LinkedList<PrimitiveAssertion>(); + for (int i = 0; i < primitiveAssertions.size(); i++) + { + retVal.add((PrimitiveAssertion)primitiveAssertions.get(i)); + } + + return retVal; + } + +} Property changes on: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4638 - in stack/native/branches/ropalka/trunk/src/test: java/org/jboss/test/ws/jaxws/wsrm/oneway and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-09-27 06:54:30 -0400 (Thu, 27 Sep 2007) New Revision: 4638 Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml Removed: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java Log: refactoring WSRM configuration to standard JAXWS config Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -2,7 +2,10 @@ import javax.jws.WebService; +import org.jboss.ws.annotation.EndpointConfig; + @WebService +@EndpointConfig(configName = "Standard WSRM Client", configFile = "META-INF/wsrm-jaxws-client-config.xml") public interface OneWayServiceIface { void method1(); Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -18,7 +18,7 @@ ( @Policy ( - policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml", + policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml", scope = PolicyScopeLevel.WSDL_BINDING ) ) Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -12,8 +12,11 @@ import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; +import org.jboss.ws.annotation.EndpointConfig; + @WebService(name = "ReqRes", targetNamespace = "http://org.jboss.ws/jaxws/wsrm") @SOAPBinding(style = Style.RPC) +@EndpointConfig(configName = "Standard WSRM Client", configFile = "META-INF/wsrm-jaxws-client-config.xml") public interface ReqResServiceIface { @WebMethod(operationName = "echo") Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -26,7 +26,7 @@ ( @Policy ( - policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml", + policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml", scope = PolicyScopeLevel.WSDL_BINDING ) ) Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-wsrm.war"); + return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-wsrm.war, jaxws-wsrm-client.jar"); } @Override Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java =================================================================== --- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-09-27 10:54:30 UTC (rev 4638) @@ -72,7 +72,7 @@ public static Test suite() { - return new JBossWSTestSetup(ReqResTestCase.class, "jaxws-wsrm.war"); + return new JBossWSTestSetup(ReqResTestCase.class, "jaxws-wsrm.war, jaxws-wsrm-client.jar"); } @Override Deleted: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jboss-ws-rm - xmlns="http://www.jboss.com/ws-rm/config" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-rm/config - http://www.jboss.com/ws-rm/schema/jboss-ws-rm_1_0.xsd"> - -  - <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> - -  - <message-store - name="Database Based Message Store" - class="org.jboss.ws.extensions.wsrm.msgstores.DBMessageStore" - storeId="clientStore"> - <config-file>META-INF/db-msgstore-config.xml</config-file> - </message-store> - -</jboss-ws-rm> Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml (rev 0) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config + xmlns="urn:jboss:jaxws-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard WSRM Client</config-name> + <reliable-messaging> + <delivery-assurance inOrder="true" quality="AtLeastOnce"/> + <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> + <message-store + id="wsrmStoreId" + class="custom.MessageStoreImpl"> + <config-file>META-INF/config.xml</config-file> + </message-store> + <port name="{http://org.jboss.ws/jaxws/wsrm}ReqResPort"> + <delivery-assurance inOrder="false" quality="AtMostOnce"/> + </port> + </reliable-messaging> + </client-config> + +</jaxws-config> Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jboss-ws-rm - xmlns="http://www.jboss.com/ws-rm/config" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-rm/config - http://www.jboss.com/ws-rm/schema/jboss-ws-rm_1_0.xsd"> - -  - <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> - -  - <message-store - name="Database Based Message Store" - class="org.jboss.ws.extensions.wsrm.msgstores.DBMessageStore" - storeId="serverStore"> - <config-file>WEB-INF/db-msgstore-config.xml</config-file> - </message-store> - -</jboss-ws-rm> Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml (rev 0) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsp:Policy + wsu:Id="exactly_one_in_order_rm_delivery" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsrmp:DeliveryAssurance> + <wsp:Policy> + <wsrmp:ExactlyOnce/> + <wsrmp:InOrder/> + </wsp:Policy> + </wsrmp:DeliveryAssurance> +</wsp:Policy> Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml (rev 0) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config + xmlns="urn:jboss:jaxws-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard WSRM Endpoint</config-name> + <reliable-messaging> + <delivery-assurance inOrder="true" quality="AtLeastOnce"/> + <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/> + <message-store + id="wsrmStoreId" + class="custom.MessageStoreImpl"> + <config-file>META-INF/config.xml</config-file> + </message-store> + <port name="{http://org.jboss.ws/jaxws/wsrm}ReqResPort"> + <delivery-assurance inOrder="false" quality="AtMostOnce"/> + </port> + </reliable-messaging> + </endpoint-config> + +</jaxws-config> Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml =================================================================== --- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml 2007-09-27 07:15:53 UTC (rev 4637) +++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml 2007-09-27 10:54:30 UTC (rev 4638) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsp:Policy - wsu:Id="exactly_one_in_order_rm_delivery" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsrmp:DeliveryAssurance> - <wsp:Policy> - <wsrmp:ExactlyOnce/> - <wsrmp:InOrder/> - </wsp:Policy> - </wsrmp:DeliveryAssurance> -</wsp:Policy>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4637 - stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-27 03:15:53 -0400 (Thu, 27 Sep 2007) New Revision: 4637 Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java Log: disable support for jax-ws 2.1 Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-09-26 18:58:20 UTC (rev 4636) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java 2007-09-27 07:15:53 UTC (rev 4637) @@ -48,7 +48,7 @@ private String targetPackage = null; private PrintStream messageStream = null; private String wsdlLocation = null; - private List<String> additionalCompilerClassPath = null; + private List<String> additionalCompilerClassPath = new ArrayList<String>(); private String target = "2.0"; @Override @@ -154,13 +154,27 @@ args.add(outputDir.getAbsolutePath()); // Always set the target + if(!target.equals("2.0")) + throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0"); + args.add("-target"); args.add(target); // finally the WSDL file args.add(wsdl.toString()); - try + // See WsimportTool#compileGeneratedClasses() + if(!additionalCompilerClassPath.isEmpty()) + { + StringBuffer javaCP = new StringBuffer(); + for(String s : additionalCompilerClassPath) + { + javaCP.append(s).append(File.pathSeparator); + } + System.setProperty("java.class.path", javaCP.toString()); + } + + try { // enforce woodstox if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4636 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-26 14:58:20 -0400 (Wed, 26 Sep 2007) New Revision: 4636 Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java Log: Use absolutepaths in script test cases. Makes the output reproducable Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2007-09-26 18:42:59 UTC (rev 4635) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2007-09-26 18:58:20 UTC (rev 4636) @@ -61,7 +61,11 @@ fail("This test has not been verified on windows"); } - String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o wsconsume/java " + WSDL_LOCATION; + // use absolute path for the output to be re-usable + String absWsdlLoc= new File(WSDL_LOCATION).getAbsolutePath(); + String absOutput = new File("wsconsume/java").getAbsolutePath(); + + String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o "+absOutput+" "+ absWsdlLoc; Process p = executeCommand(command); // check status code @@ -78,8 +82,10 @@ { fail("This test has not been verified on windows"); } - - String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o wsprovide/java/ --classpath "+TEST_EXEC_DIR+"/classes "+ ENDPOINT_CLASS; + + String absOutput = new File("wsprovide/java/").getAbsolutePath(); + + String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o "+absOutput+" --classpath "+TEST_EXEC_DIR+"/classes "+ ENDPOINT_CLASS; Process p = executeCommand(command); // check status code

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4635 - in framework/trunk/src/test: java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-09-26 14:42:59 -0400 (Wed, 26 Sep 2007) New Revision: 4635 Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: Added testcase for wsprovide and wsconsume scripts that reside with the AS Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-26 15:04:52 UTC (rev 4634) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-09-26 18:42:59 UTC (rev 4635) @@ -401,6 +401,8 @@ <mkdir dir="${tests.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> <jvmarg value="-Djava.security.manager"/> + <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> + <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> @@ -436,9 +438,12 @@ --> <target name="one-test" depends="tests-init" if="test" description="Run a single unit test"> <mkdir dir="${tests.output.dir}/reports"/> + <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> + <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> + <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2007-09-26 18:42:59 UTC (rev 4635) @@ -0,0 +1,123 @@ +/* + * 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.test.ws.jaxws.smoke.tools; + +import junit.framework.TestCase; + +import java.io.File; +import java.io.IOException; + +/** + * Test the wsprovide and wsconsume scripts that reside + * under JBOSS_HOME/bin. This basically verifies all dependencies are + * met to run the shell scripts. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class ScriptTestCase extends TestCase +{ + private String WSDL_LOCATION = "resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"; + private String ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean"; + + private String JBOSS_HOME; + private String JDK_HOME; + private String TEST_EXEC_DIR; + private String OS; + + protected void setUp() throws Exception + { + super.setUp(); + + JBOSS_HOME = System.getProperty("jboss.home"); + TEST_EXEC_DIR = System.getProperty("test.execution.dir"); + JDK_HOME = System.getProperty("jdk.home"); + OS = System.getProperty("os.name").toLowerCase(); + } + + public void testWSConsumeFromCommandLine() throws Exception + { + if(isWindowsOS()) + { + fail("This test has not been verified on windows"); + } + + String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o wsconsume/java " + WSDL_LOCATION; + Process p = executeCommand(command); + + // check status code + assertStatusCode(p); + + File javaSource = new File("wsconsume/java/org/openuri/_2004/_04/helloworld/EndpointInterface.java"); + + assertTrue("Sevice endpoint interface not generated", javaSource.exists()); + } + + public void testWSProvideFromCommandLine() throws Exception + { + if(isWindowsOS()) + { + fail("This test has not been verified on windows"); + } + + String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o wsprovide/java/ --classpath "+TEST_EXEC_DIR+"/classes "+ ENDPOINT_CLASS; + Process p = executeCommand(command); + + // check status code + assertStatusCode(p); + + File outputDir = new File("wsprovide/java"); + File javaSource = new File( + outputDir.getAbsolutePath()+ + "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java" + ); + + assertTrue("Response wrapper not generated", javaSource.exists()); + } + + private Process executeCommand(String command) + throws IOException + { + // be verbose + System.out.println("cmd: " + command); + System.out.println("test execution dir: " + TEST_EXEC_DIR); + + Process p = Runtime.getRuntime().exec( + command, + new String[] {"JBOSS_HOME="+ JBOSS_HOME, "JAVA_HOME="+ JDK_HOME} + ); + return p; + } + + private void assertStatusCode(Process p) + throws InterruptedException + { + // check status code + int status = p.waitFor(); + assertTrue("wsprovide did exit with status " + status, status==0); + } + + private boolean isWindowsOS() + { + return ( (OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1 )); + } +} Property changes on: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4634 - legacy/branches.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-09-26 11:04:52 -0400 (Wed, 26 Sep 2007) New Revision: 4634 Removed: legacy/branches/jbossws-1.0.4.GA_JBWS-1821/ Log: Removed file/folder

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4633 - in legacy/branches/jbossws-1.0.0.GA_JBWS-1821: src/main/java/org/jboss/ws/jaxrpc and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-09-26 10:01:53 -0400 (Wed, 26 Sep 2007) New Revision: 4633 Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java Log: [JBWS-1821] Patch for [JBWS-1820] Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/build-thirdparty.xml 2007-09-26 14:01:53 UTC (rev 4633) @@ -42,7 +42,7 @@ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j-dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.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/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/CallProxy.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -77,9 +77,11 @@ { jbosswsProperties.add(StubExt.PROPERTY_CLIENT_TIMEOUT); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE); + jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_ALGORITHM); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_PASSWORD); jbosswsProperties.add(StubExt.PROPERTY_KEY_STORE_TYPE); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE); + jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_ALGORITHM); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_PASSWORD); jbosswsProperties.add(StubExt.PROPERTY_TRUST_STORE_TYPE); jbosswsProperties.add(StubExt.PROPERTY_AUTH_TYPE); @@ -93,9 +95,11 @@ { 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.keyStoreAlgorithm", StubExt.PROPERTY_KEY_STORE_ALGORITHM); 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.trustStoreAlgorithm", StubExt.PROPERTY_TRUST_STORE_ALGORITHM); legacyPropertyMap.put("org.jboss.webservice.trustStorePassword", StubExt.PROPERTY_TRUST_STORE_PASSWORD); legacyPropertyMap.put("org.jboss.webservice.trustStoreType", StubExt.PROPERTY_TRUST_STORE_TYPE); } Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/jaxrpc/StubExt.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -40,12 +40,16 @@ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; /** KeyStore property: org.jboss.ws.keyStore */ static final String PROPERTY_KEY_STORE = "org.jboss.ws.keyStore"; + /** KeyStore property: org.jboss.ws.keyStoreAlgorithm */ + static final String PROPERTY_KEY_STORE_ALGORITHM = "org.jboss.ws.keyStoreAlgorithm"; /** KeyStorePassword property: org.jboss.ws.keyStorePassword */ static final String PROPERTY_KEY_STORE_PASSWORD = "org.jboss.ws.keyStorePassword"; /** KeyStoreType property: org.jboss.ws.keyStoreType */ static final String PROPERTY_KEY_STORE_TYPE = "org.jboss.ws.keyStoreType"; /** TrustStore property: org.jboss.ws.trustStore */ static final String PROPERTY_TRUST_STORE = "org.jboss.ws.trustStore"; + /** TrustStore property: org.jboss.ws.trustStoreAlgorithm */ + static final String PROPERTY_TRUST_STORE_ALGORITHM = "org.jboss.ws.trustStoreAlgorithm"; /** TrustStorePassword property: org.jboss.ws.trustStorePassword */ static final String PROPERTY_TRUST_STORE_PASSWORD = "org.jboss.ws.trustStorePassword"; /** TrustStoreType property: org.jboss.ws.trustStoreType */ Modified: legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java =================================================================== --- legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2007-09-26 13:11:47 UTC (rev 4632) +++ legacy/branches/jbossws-1.0.0.GA_JBWS-1821/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2007-09-26 14:01:53 UTC (rev 4633) @@ -72,9 +72,11 @@ static { configMap.put(StubExt.PROPERTY_KEY_STORE, RemotingSSLSocketFactory.REMOTING_KEY_STORE_FILE_PATH); + configMap.put(StubExt.PROPERTY_KEY_STORE_ALGORITHM, RemotingSSLSocketFactory.REMOTING_ALGORITHM); configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, RemotingSSLSocketFactory.REMOTING_KEY_STORE_PASSWORD); configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, RemotingSSLSocketFactory.REMOTING_KEY_STORE_TYPE); configMap.put(StubExt.PROPERTY_TRUST_STORE, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_FILE_PATH); + configMap.put(StubExt.PROPERTY_TRUST_STORE_ALGORITHM, RemotingSSLSocketFactory.REMOTING_TRUST_ALGORITHM); configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_PASSWORD); configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, RemotingSSLSocketFactory.REMOTING_TRUST_STORE_TYPE); }

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