December 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5266 - in stack/cxf/trunk: ant-import and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-12 08:31:36 -0500 (Wed, 12 Dec 2007) New Revision: 5266 Added: stack/cxf/trunk/ant-import/build-testsuite-jars.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml stack/cxf/trunk/src/test/java/org/ stack/cxf/trunk/src/test/java/org/jboss/ stack/cxf/trunk/src/test/java/org/jboss/test/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java stack/cxf/trunk/src/test/resources/jaxws/ stack/cxf/trunk/src/test/resources/jaxws/cxf/ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml Removed: stack/cxf/trunk/src/main/resources/cxf-incubator.jar/ Modified: stack/cxf/trunk/ant-import/build-testsuite.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/version.properties Log: Externalize CXF configuration Initial cut of WS-RM integration Added: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml (rev 0) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  + + <target name="build-testsuite-jars" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxws-cxf-reliable.war" webxml="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.class"/> + </classes> +  + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + + </target> + +</project> Property changes on: stack/cxf/trunk/ant-import/build-testsuite-jars.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -72,6 +72,7 @@ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.dir}/ant-import/build-testsuite-jars.xml" target="build-testsuite-jars"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -188,6 +188,8 @@ <available property="geronimo-javamail.available" filepath="${cxf.distribution.lib}" file="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> <available property="geronimo-ws-metadata.available" filepath="${cxf.distribution.lib}" file="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> <available property="jaxws-api.available" filepath="${cxf.distribution.lib}" file="jaxws-api-${cxf.jaxws.api}.jar"/> + <available property="jetty.available" filepath="${cxf.distribution.lib}" file="jetty-${cxf.jetty}.jar"/> + <available property="jetty-util.available" filepath="${cxf.distribution.lib}" file="jetty-util-${cxf.jetty}.jar"/> <available property="jdom.available" filepath="${cxf.distribution.lib}" file="jdom-${cxf.jdom}.jar"/> <available property="neethi.available" filepath="${cxf.distribution.lib}" file="neethi-${cxf.neethi}.jar"/> <available property="saaj-api.available" filepath="${cxf.distribution.lib}" file="saaj-api-${cxf.saaj}.jar"/> @@ -203,6 +205,8 @@ <fail message="geronimo-javamail_${cxf.geronimo.javamail}.jar not available" unless="geronimo-javamail.available"/> <fail message="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar not available" unless="geronimo-ws-metadata.available"/> <fail message="jaxws-api-${cxf.jaxws.api}.jar not available" unless="jaxws-api.available"/> + <fail message="jetty-${cxf.jetty}.jar not available" unless="jetty.available"/> + <fail message="jetty-util-${cxf.jetty}.jar not available" unless="jetty-util.available"/> <fail message="jdom-${cxf.jdom}.jar not available" unless="jdom.available"/> <fail message="neethi-${cxf.neethi}.jar not available" unless="neethi.available"/> <fail message="saaj-api-${cxf.saaj}.jar not available" unless="saaj-api.available"/> @@ -220,6 +224,8 @@ <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="jetty-${cxf.jetty}.jar"/> + <include name="jetty-util-${cxf.jetty}.jar"/> <include name="jdom-${cxf.jdom}.jar"/> <include name="neethi-${cxf.neethi}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/build.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -128,10 +128,10 @@ </war>  - <copy file="${thirdparty.dir}/cxf-${cxf.version}.jar" todir="${cxf.output.lib.dir}" overwrite="true"/> - <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar" update="true"> - <fileset dir="${cxf.resources.dir}/cxf-incubator.jar"> - <include name="META-INF/cxf/cxf.extension"/> + <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/> + <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar"> + <fileset dir="${cxf.output.lib.dir}/cxf-${cxf.version}"> + <exclude name="META-INF/cxf/**"/> </fileset> </jar> @@ -165,6 +165,8 @@ <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="jetty-${cxf.jetty}.jar"/> + <include name="jetty-util-${cxf.jetty}.jar"/> <include name="jdom-${cxf.jdom}.jar"/> <include name="neethi-${cxf.neethi}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> @@ -218,6 +220,8 @@ <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="jetty-${cxf.jetty}.jar"/> + <include name="jetty-util-${cxf.jetty}.jar"/> <include name="jdom-${cxf.jdom}.jar"/> <include name="neethi-${cxf.neethi}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2007-12-12 13:31:36 UTC (rev 5266) @@ -105,19 +105,18 @@ private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException { String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); - - InputStream is; - try + if (location != null) { - is = new URL(location).openStream(); - } - catch (IOException e) - { - throw new ServletException(e); - } + InputStream is; + try + { + is = new URL(location).openStream(); + } + catch (IOException e) + { + throw new ServletException(e); + } - if (is != null) - { childCtx = new GenericApplicationContext(ctx); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2007-12-12 13:31:36 UTC (rev 5266) @@ -23,10 +23,13 @@ //$Id: XFireServicesDeployer.java 3802 2007-07-05 16:44:32Z thomas.diesler(a)jboss.com $ +import java.io.IOException; +import java.net.URL; import java.util.HashMap; import java.util.Map; import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; @@ -61,43 +64,79 @@ @Override public void create(Deployment dep) { - DeploymentType depType = dep.getType(); - if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) - throw new IllegalStateException("Unsupported deployment type: " + depType); - - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) + // Look for cxf.xml descriptor + ClassLoader initCL = dep.getInitialClassLoader(); + URL cxfURL = initCL.getResource("cxf.xml"); + if (cxfURL != null) { - String id = ep.getShortName(); - String address = ep.getAddress(); - String implementor = ep.getTargetBeanName(); + log.info("CXF configuration found: " + cxfURL); + } + else + { + // Look for jbossws-cxf.xml descriptor + DeploymentType depType = dep.getType(); + + String metadir; + if (depType == DeploymentType.JAXWS_EJB3) + metadir = "META-INF"; + else if (depType == DeploymentType.JAXWS_JSE) + metadir = "WEB-INF"; + else + throw new IllegalStateException("Unsupported deployment type: " + depType); - DDEndpoint ddep = new DDEndpoint(id, address, implementor); - - if (depType == DeploymentType.JAXWS_EJB3) + try { - ddep.setInvoker(invokerEJB3); + ArchiveDeployment archdep = (ArchiveDeployment)dep; + cxfURL = archdep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); + log.info("JBossWS-CXF configuration found: " + cxfURL); } - - if (depType == DeploymentType.JAXWS_JSE) + catch (IOException ex) { - ddep.setInvoker(invokerJSE); + // ignore, jbossws-cxf.xml not found } + + // Generate the jbossws-cxf.xml descriptor + if (cxfURL == null) + { + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String id = ep.getShortName(); + String address = ep.getAddress(); + String implementor = ep.getTargetBeanName(); - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } + DDEndpoint ddep = new DDEndpoint(id, address, implementor); - dep.addAttachment(DDBeans.class, dd); + if (depType == DeploymentType.JAXWS_EJB3) + { + ddep.setInvoker(invokerEJB3); + } - String propKey = "org.jboss.ws.webapp.ContextParameterMap"; - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); - if (contextParams == null) - { - contextParams = new HashMap<String, String>(); - dep.setProperty(propKey, contextParams); + if (depType == DeploymentType.JAXWS_JSE) + { + ddep.setInvoker(invokerJSE); + } + + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } + + cxfURL = dd.createFileURL(); + log.info("JBossWS-CXF configuration generated: " + cxfURL); + + dep.addAttachment(DDBeans.class, dd); + } + + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) + { + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); + } + + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); } - contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, dd.createFileURL().toExternalForm()); } @Override Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" attributeFormDefault="unqualified" +> + + <xsd:element name="mappings"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="mappingType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="property" type="propertyType" /> + <xsd:element name="method" type="methodType" /> + <xsd:element name="component" type="componentTypeType" /> + </xsd:choice> + <xsd:attribute name="uri" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="methodType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="return-type" type="return-typeType" /> + <xsd:element name="parameter" type="parameterType" /> + </xsd:choice> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="return-typeType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="parameterType"> + <xsd:attribute name="index" type="xsd:int" /> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="componentTypeType"> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:attributeGroup name="mappedType"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="typeName" type="xsd:string" /> + <xsd:attribute name="mappedName" type="xsd:string" /> + <xsd:attribute name="nillable" type="xsd:boolean" /> + <xsd:attribute name="flag" type="xsd:boolean" /> + <xsd:attribute name="ignore" type="xsd:boolean" /> + <xsd:attribute name="componentType" type="xsd:string" /> + <xsd:attribute name="keyType" type="xsd:string" /> + <xsd:attribute name="valueType" type="xsd:string" /> + <xsd:attribute name="minOccurs" type="xsd:int" /> + <xsd:attribute name="maxOccurs" type="xsd:string" /> + <xsd:attribute name="style"> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="attribute" /> + <xsd:enumeration value="element" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:attributeGroup> +</xsd:schema> \ No newline at end of file Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/> + + <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder" + class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"> + <property name="knownElements"> + <set> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + </set> + </property> + </bean> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://apache.org/cxf/binding/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + + <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" + lazy-init="false" + depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> + +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/> + <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/> + + + <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/jms</value> + <value>http://cxf.apache.org/transports/jms/configuration</value> + </list> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/local</value> + </list> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"> + <property name="bus" ref="cxf"/> + <property name="enabled" value="false"/> + <property name="threaded" value="false"/> + <property name="daemon" value="false"/> + </bean> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.object.ObjectBindingFactory" + lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > + <property name="bus" ref="cxf"/> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/binding/object</value> + </set> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/> + <property name="idsProperty" value="knownElements"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.PolicyConstants"/> + + <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/> + <property name="idsProperty" value="assertionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry" + class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/> + <property name="idsProperty" value="domainExpressionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/> + + <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl"> + <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/> + </bean> + + <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + +  + <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"> + <property name="bus" ref="cxf"/> + </bean> + <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"> + <constructor-arg><ref bean="cxf"/></constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder"> + <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/> + <constructor-arg> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + <constructor-arg value="RMAssertion"/> + </bean> + </constructor-arg> + </bean> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true"> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + </list> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.binding.soap.customEditorConfigurer" + class="org.springframework.beans.factory.config.CustomEditorConfigurer"> + <property name="customEditors"> + <map> + <entry key="org.apache.cxf.binding.soap.SoapVersion"> + <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/> + </entry> + </map> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://www.w3.org/2004/08/wsdl/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + </set> + </property> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,14 @@ +META-INF/cxf/cxf-extension-jaxws.xml +META-INF/cxf/cxf-extension-rm.xml +META-INF/cxf/cxf-extension-addr.xml +META-INF/cxf/cxf-extension-http-jetty.xml +META-INF/cxf/cxf-extension-object-binding.xml +META-INF/cxf/cxf-extension-http.xml +META-INF/cxf/cxf-extension-http-binding.xml +META-INF/cxf/cxf-extension-xml.xml +META-INF/cxf/cxf-extension-policy.xml +META-INF/cxf/cxf-extension-jms.xml +META-INF/cxf/cxf-extension-local.xml +META-INF/cxf/cxf-extension-management.xml +META-INF/cxf/cxf-extension-soap.xml +META-INF/cxf/cxf-extension-jbossws.xml \ No newline at end of file Added: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> + <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> + <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> + + <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> + <constructor-arg> + <list> + <bean class="org.apache.cxf.resource.ClasspathResolver"/> + <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> + <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> + </list> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.configuration.Configurer" + class="org.apache.cxf.configuration.spring.ConfigurerImpl"> + </bean> + + <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.binding.BindingFactory"/> + <property name="idsProperty" value="activationNamespaces"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> + + </bean> + + <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> + <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> + + + <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> + <constructor-arg ref="cxf"/> + <constructor-arg> + <list> + <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> + <constructor-arg ref="cxf"/> + </bean> + </list> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> + <property name="bus" ref="cxf"/> + </bean> +</beans> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,40 @@ +/* + * 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.cxf.reliable; + +// $Id$ + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface RMEndpoint +{ + String echo(String input); +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,45 @@ +/* + * 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.cxf.reliable; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class RMEndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,61 @@ +/* + * 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.cxf.reliable; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class RMTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-reliable/TestService"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/reliable"; + + public static Test suite() + { + return new JBossWSTestSetup(RMTestCase.class, "jaxws-cxf-reliable.war"); + } + + public void testLegalAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,31 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + +  + + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'> + + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + +  + + </jaxws:endpoint> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml 2007-12-12 13:31:36 UTC (rev 5266) @@ -0,0 +1,31 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'> + + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + + <jaxws:features> + <p:policies> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </p:policies> + </jaxws:features> + + </jaxws:endpoint> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-12-12 12:37:50 UTC (rev 5265) +++ stack/cxf/trunk/version.properties 2007-12-12 13:31:36 UTC (rev 5266) @@ -24,6 +24,7 @@ cxf.geronimo.javamail=1.4_spec-1.0-M1 cxf.geronimo.ws.metadata=2.0_spec-1.1.1 cxf.jaxws.api=2.0 +cxf.jetty=6.1.5 cxf.jdom=1.0 cxf.neethi=2.0.2 cxf.saaj=1.3

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5265 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-12 07:37:50 -0500 (Wed, 12 Dec 2007) New Revision: 5265 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequenceImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceIface.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml Log: creating server side RM handler Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -67,7 +67,7 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceImpl; +import org.jboss.ws.extensions.wsrm.RMClientSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.wsrm.spi.RMConstants; @@ -105,14 +105,14 @@ private static HandlerType[] HANDLER_TYPES = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST }; // WS-RM sequence associated with the proxy - private RMSequenceImpl wsrmSequence; + private RMClientSequenceImpl wsrmSequence; - public final void setWSRMSequence(RMSequenceImpl wsrmSequence) + public final void setWSRMSequence(RMClientSequenceImpl wsrmSequence) { this.wsrmSequence = wsrmSequence; } - public final RMSequenceImpl getWSRMSequence() + public final RMClientSequenceImpl getWSRMSequence() { return this.wsrmSequence; } @@ -513,7 +513,7 @@ try { // set up addressing data - RMSequenceImpl candidateSequence = new RMSequenceImpl(addressableClient, getEndpointMetaData().getConfig().getRMMetaData()); + RMClientSequenceImpl candidateSequence = new RMClientSequenceImpl(addressableClient, getEndpointMetaData().getConfig().getRMMetaData()); String address = getEndpointMetaData().getEndpointAddress(); String action = RMConstant.CREATE_SEQUENCE_WSA_ACTION; AddressingProperties addressingProps = null; Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -1,318 +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.extensions.wsrm; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.JAXWSAConstants; -import javax.xml.ws.addressing.soap.SOAPAddressingProperties; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.MessageContext.Scope; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.spi.RMConstants; -import org.jboss.ws.extensions.wsrm.spi.RMMessageFactory; -import org.jboss.ws.extensions.wsrm.spi.RMProvider; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequence; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequenceResponse; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequence; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequenceResponse; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequence; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequenceResponse; - -/** - * TODO: add comment - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 23, 2007 - */ -@SuppressWarnings("unchecked") -public final class RMClientHandler extends GenericSOAPHandler -{ - private static final Logger log = Logger.getLogger(RMClientHandler.class); - private static final RMMessageFactory rmFactory = RMProvider.get().getMessageFactory(); - private static final RMConstants rmConstants = RMProvider.get().getConstants(); - private static final Set headers = RMConstant.PROTOCOL_OPERATION_QNAMES; - - public Set getHeaders() - { - return headers; - } - - protected boolean handleOutbound(MessageContext msgContext) - { - log.debug("handling outbound message"); - - CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext; - SOAPAddressingProperties addrProps = (SOAPAddressingProperties)commonMsgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - if (addrProps == null) - throw new RMException("WS-Addressing properties not found in message context"); - - Map rmRequestContext = (Map)commonMsgContext.get(RMConstant.REQUEST_CONTEXT); - List<QName> outMsgs = (List<QName>)rmRequestContext.get(RMConstant.PROTOCOL_MESSAGES); - Map<QName, RMSerializable> data = new HashMap<QName, RMSerializable>(); - String optionalMessageId = (addrProps.getMessageID() != null) ? addrProps.getMessageID().getURI().toString() : null; - rmRequestContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId); - rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); - SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage(); - RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE); - - QName msgQName = rmConstants.getCreateSequenceQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize CreateSequence to message - String replyTo = addrProps.getReplyTo().getAddress().getURI().toString(); - RMCreateSequence createSequence = rmFactory.newCreateSequence(); - createSequence.setAcksTo(replyTo); - createSequence.serializeTo(soapMessage); - data.put(msgQName, createSequence); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getSequenceQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize Sequence to message - RMSequence sequence = rmFactory.newSequence(); - sequence.setIdentifier(sequenceImpl.getOutboundId()); - sequence.setMessageNumber(sequenceImpl.newMessageNumber()); - sequence.serializeTo(soapMessage); - data.put(msgQName, sequence); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getAckRequestedQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize AckRequested to message - RMAckRequested ackRequested = rmFactory.newAckRequested(); - ackRequested.setIdentifier(sequenceImpl.getOutboundId()); - ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber()); - ackRequested.serializeTo(soapMessage); - data.put(msgQName, ackRequested); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getCloseSequenceQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize CloseSequence to message - RMCloseSequence closeSequence = rmFactory.newCloseSequence(); - closeSequence.setIdentifier(sequenceImpl.getOutboundId()); - closeSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber()); - closeSequence.serializeTo(soapMessage); - data.put(msgQName, closeSequence); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getCloseSequenceResponseQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize CloseSequenceResponse to message - RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse(); - closeSequenceResponse.setIdentifier(sequenceImpl.getOutboundId()); - data.put(msgQName, closeSequenceResponse); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getTerminateSequenceQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize TerminateSequence to message - RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence(); - terminateSequence.setIdentifier(sequenceImpl.getOutboundId()); - terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber()); - terminateSequence.serializeTo(soapMessage); - data.put(msgQName, terminateSequence); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getTerminateSequenceResponseQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize terminateSequenceResponse to message - RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse(); - terminateSequenceResponse.setIdentifier(sequenceImpl.getOutboundId()); - terminateSequenceResponse.serializeTo(soapMessage); - data.put(msgQName, terminateSequenceResponse); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - msgQName = rmConstants.getSequenceAcknowledgementQName(); - if (outMsgs.contains(msgQName)) - { - // try to serialize SequenceAcknowledgement to message - RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement(); - sequenceAcknowledgement.setIdentifier(sequenceImpl.getInboundId()); - Iterator<Long> receivedInboudMessages = sequenceImpl.getReceivedInboundMessages().iterator(); - while (receivedInboudMessages.hasNext()) - { - long messageNo = receivedInboudMessages.next(); - RMSequenceAcknowledgement.RMAcknowledgementRange range = sequenceAcknowledgement.newAcknowledgementRange(); - range.setLower(messageNo); - range.setUpper(messageNo); - sequenceAcknowledgement.addAcknowledgementRange(range); - } - sequenceAcknowledgement.serializeTo(soapMessage); - data.put(msgQName, sequenceAcknowledgement); - log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); - } - - // TODO: implement SequenceFault serialization - - return true; - } - - protected boolean handleInbound(MessageContext msgContext) - { - log.debug("handling inbound message"); - - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - Map<String, Object> rmResponseContext = new HashMap(); - List<QName> messages = new LinkedList<QName>(); - rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, messages); - Map<QName, RMSerializable> data = new HashMap<QName, RMSerializable>(); - rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); - msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); - msgContext.setScope(RMConstant.RESPONSE_CONTEXT, Scope.APPLICATION); - - try - { - // try to deserialize CreateSequenceResponse from message - QName msgQName = rmConstants.getCreateSequenceResponseQName(); - RMCreateSequenceResponse wsrmMsg = rmFactory.newCreateSequenceResponse(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize AckRequested from message - QName msgQName = rmConstants.getAckRequestedQName(); - RMAckRequested wsrmMsg = rmFactory.newAckRequested(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize Sequence from message - QName msgQName = rmConstants.getSequenceQName(); - RMSequence wsrmMsg = rmFactory.newSequence(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize SequenceAcknowledgement from message - QName msgQName = rmConstants.getSequenceAcknowledgementQName(); - RMSequenceAcknowledgement wsrmMsg = rmFactory.newSequenceAcknowledgement(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize CloseSequence from message - QName msgQName = rmConstants.getCloseSequenceQName(); - RMCloseSequence wsrmMsg = rmFactory.newCloseSequence(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize CloseSequence from message - QName msgQName = rmConstants.getCloseSequenceResponseQName(); - RMCloseSequenceResponse wsrmMsg = rmFactory.newCloseSequenceResponse(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize TerminateSequence from message - QName msgQName = rmConstants.getTerminateSequenceQName(); - RMTerminateSequence wsrmMsg = rmFactory.newTerminateSequence(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - try - { - // try to deserialize TerminateSequenceResponse from message - QName msgQName = rmConstants.getTerminateSequenceResponseQName(); - RMTerminateSequenceResponse wsrmMsg = rmFactory.newTerminateSequenceResponse(); - wsrmMsg.deserializeFrom(soapMessage); - messages.add(msgQName); - data.put(msgQName, wsrmMsg); - log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); - } - catch (RMException ignore) {} - - // TODO: implement SequenceFault deserialization - - if (data.size() == 0) - throw new RMException("RM handler was not able to find WS-RM message in the payload"); - - return true; - } - -} Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequenceImpl.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequenceImpl.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -0,0 +1,326 @@ +/* + * 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; + +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.JAXWSAConstants; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.jaxws.client.ClientImpl; +import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.ws.extensions.addressing.AddressingClientUtil; +import org.jboss.ws.extensions.wsrm.config.RMConfig; +import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.spi.RMConstants; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMIncompleteSequenceBehavior; +import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener; + +/** + * Client side implementation of the RM sequence + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 25, 2007 + */ +@SuppressWarnings("unchecked") +public final class RMClientSequenceImpl implements RMSequenceIface, RMUnassignedMessageListener +{ + private static final Logger logger = Logger.getLogger(RMClientSequenceImpl.class); + private static final String PATH_PREFIX = "/temporary_listen_address/"; + private static final RMConstants wsrmConstants = RMProvider.get().getConstants(); + + private final RMConfig wsrmConfig; + private final boolean addressableClient; + private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>(); + private final Set<Long> receivedInboundMessages = new TreeSet<Long>(); + private RMIncompleteSequenceBehavior behavior = RMIncompleteSequenceBehavior.NO_DISCARD; + private String incomingSequenceId; + private String outgoingSequenceId; + private long duration = -1; + private long creationTime; + private URI backPort; + private ClientImpl client; + private boolean isFinal; + private AtomicBoolean inboundMessageAckRequested = new AtomicBoolean(); + private AtomicLong messageNumber = new AtomicLong(); + private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger(); + + public RMClientSequenceImpl(boolean addrType, RMConfig wsrmConfig) + { + super(); + if (wsrmConfig == null) + throw new RMException("WS-RM configuration missing"); + if (wsrmConfig.getBackPortsServer() == null) + throw new RMException("WS-RM backports server configuration missing"); + + this.addressableClient = addrType; + this.wsrmConfig = wsrmConfig; + try + { + String host = wsrmConfig.getBackPortsServer().getHost(); + if (host == null) + { + host = InetAddress.getLocalHost().getCanonicalHostName(); + logger.debug("Backports server configuration omits host configuration - using autodetected " + host); + } + String port = wsrmConfig.getBackPortsServer().getPort(); + String path = PATH_PREFIX + UUIDGenerator.generateRandomUUIDString(); + this.backPort = new URI("http://" + host + ":" + port + path); + } + catch (URISyntaxException use) + { + logger.warn(use); + throw new RMException(use.getMessage(), use); + } + catch (UnknownHostException uhe) + { + logger.warn(uhe); + throw new RMException(uhe.getMessage(), uhe); + } + } + + public void unassignedMessageReceived() + { + // we can't use objectLock in the method - possible deadlock + this.countOfUnassignedMessagesAvailable.addAndGet(1); + logger.debug("Expected sequence expiration in " + ((System.currentTimeMillis() - this.creationTime) / 1000) + "seconds"); + logger.debug("Unassigned message available in callback handler"); + } + + public final RMConfig getRMConfig() + { + return this.wsrmConfig; + } + + public final Set<Long> getReceivedInboundMessages() + { + return this.receivedInboundMessages; + } + + public final BindingProvider getBindingProvider() + { + return (BindingProvider)this.client; + } + + public final void setFinal() + { + this.isFinal = true; + logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final"); + } + + public final void ackRequested(boolean requested) + { + this.inboundMessageAckRequested.set(requested); + logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages); + } + + public final boolean isAckRequested() + { + return this.inboundMessageAckRequested.get(); + } + + public final void addReceivedInboundMessage(long messageId) + { + this.receivedInboundMessages.add(messageId); + logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId); + } + + public final void addReceivedOutboundMessage(long messageId) + { + this.acknowledgedOutboundMessages.add(messageId); + logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server"); + } + + public final void setOutboundId(String outboundId) + { + this.outgoingSequenceId = outboundId; + } + + public final void setInboundId(String inboundId) + { + this.incomingSequenceId = inboundId; + } + + public final void setClient(ClientImpl client) + { + this.client = client; + } + + public final void setDuration(long duration) + { + if (duration > 0) + { + this.creationTime = System.currentTimeMillis(); + this.duration = duration; + } + } + + public final long getDuration() + { + return this.duration; + } + + public final URI getBackPort() + { + // no need for synchronization + return (this.addressableClient) ? this.backPort : null; + } + + public final long newMessageNumber() + { + // no need for synchronization + return this.messageNumber.incrementAndGet(); + } + + public final long getLastMessageNumber() + { + // no need for synchronization + return this.messageNumber.get(); + } + + public final void close() throws RMException + { + try + { + sendCloseMessage(); + sendTerminateMessage(); + } + finally + { + this.client.setWSRMSequence(null); + } + } + + /** + * Sets up terminated flag to true. + */ + private void sendMessage(String action, QName operationQName, List protocolMessages) throws RMException + { + try + { + // set up addressing properties + String address = client.getEndpointMetaData().getEndpointAddress(); + AddressingProperties props = null; + if (this.client.getWSRMSequence().getBackPort() != null) + { + props = AddressingClientUtil.createDefaultProps(action, address); + props.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.client.getWSRMSequence().getBackPort())); + } + else + { + props = AddressingClientUtil.createAnonymousProps(action, address); + } + // prepare WS-RM request context + Map requestContext = client.getBindingProvider().getRequestContext(); + Map rmRequestContext = (Map)requestContext.get(RMConstant.REQUEST_CONTEXT); + if (rmRequestContext == null) + { + rmRequestContext = new HashMap(); + } + rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); + rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, this); + // set up method invocation context + requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props); + requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); + // call stub method + this.client.invoke(operationQName, new Object[] {}, client.getBindingProvider().getResponseContext()); + } + catch (Exception e) + { + throw new RMException("Unable to terminate WSRM sequence", e); + } + } + + public final void sendCloseMessage() + { + while (this.isAckRequested()) + { + logger.debug("Waiting till all inbound sequence acknowledgements will be sent"); + sendSequenceAcknowledgementMessage(); + } + Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); + wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false); + this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); + List msgs = new LinkedList(); + msgs.add(wsrmConstants.getCloseSequenceQName()); + sendMessage(RMConstant.CLOSE_SEQUENCE_WSA_ACTION, wsrmConstants.getCloseSequenceQName(), msgs); + } + + public final void sendTerminateMessage() + { + List msgs = new LinkedList(); + msgs.add(wsrmConstants.getTerminateSequenceQName()); + if (this.getInboundId() != null) + { + msgs.add(wsrmConstants.getSequenceAcknowledgementQName()); + } + sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName(), msgs); + } + + public final void sendSequenceAcknowledgementMessage() + { + Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); + wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true); + this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); + ackRequested(false); + List msgs = new LinkedList(); + msgs.add(wsrmConstants.getSequenceAcknowledgementQName()); + sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName(), msgs); + } + + public final void setBehavior(RMIncompleteSequenceBehavior behavior) + { + if (behavior != null) + { + this.behavior = behavior; + } + } + + public final String getOutboundId() + { + return outgoingSequenceId; + } + + public final String getInboundId() + { + return incomingSequenceId; + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequenceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceIface.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceIface.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceIface.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -0,0 +1,42 @@ +/* + * 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; + +import java.util.Set; + +import org.jboss.ws.extensions.wsrm.api.RMSequence; + +/** + * Detailed view to the sequence - not visible to API clients + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 12, 2007 + */ +public interface RMSequenceIface extends RMSequence +{ + String getOutboundId(); + long newMessageNumber(); + long getLastMessageNumber(); + String getInboundId(); + Set<Long> getReceivedInboundMessages(); +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -1,328 +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.extensions.wsrm; - -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.client.ClientImpl; -import org.jboss.ws.core.utils.UUIDGenerator; -import org.jboss.ws.extensions.addressing.AddressingClientUtil; -import org.jboss.ws.extensions.wsrm.config.RMConfig; -import org.jboss.ws.extensions.wsrm.api.RMException; -import org.jboss.ws.extensions.wsrm.api.RMSequence; -import org.jboss.ws.extensions.wsrm.spi.RMConstants; -import org.jboss.ws.extensions.wsrm.spi.RMProvider; -import org.jboss.ws.extensions.wsrm.spi.protocol.RMIncompleteSequenceBehavior; -import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener; - -/** - * TODO: all termination methods such as terminate, discard, ... etc must unregister the sequence from client - * Reliable messaging sequence implementation - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 25, 2007 - */ -@SuppressWarnings("unchecked") -public final class RMSequenceImpl implements RMSequence, RMUnassignedMessageListener -{ - private static final Logger logger = Logger.getLogger(RMSequenceImpl.class); - private static final String PATH_PREFIX = "/temporary_listen_address/"; - private static final RMConstants wsrmConstants = RMProvider.get().getConstants(); - - private final RMConfig wsrmConfig; - private final boolean addressableClient; - private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>(); - private final Set<Long> receivedInboundMessages = new TreeSet<Long>(); - private RMIncompleteSequenceBehavior behavior = RMIncompleteSequenceBehavior.NO_DISCARD; - private String incomingSequenceId; - private String outgoingSequenceId; - private long duration = -1; - private long creationTime; - private URI backPort; - private ClientImpl client; - private boolean isFinal; - private AtomicBoolean inboundMessageAckRequested = new AtomicBoolean(); - private AtomicLong messageNumber = new AtomicLong(); - private AtomicInteger countOfUnassignedMessagesAvailable = new AtomicInteger(); - - public RMSequenceImpl(boolean addrType, RMConfig wsrmConfig) - { - super(); - if (wsrmConfig == null) - throw new RMException("WS-RM configuration missing"); - if (wsrmConfig.getBackPortsServer() == null) - throw new RMException("WS-RM backports server configuration missing"); - - this.addressableClient = addrType; - this.wsrmConfig = wsrmConfig; - try - { - String host = wsrmConfig.getBackPortsServer().getHost(); - if (host == null) - { - host = InetAddress.getLocalHost().getCanonicalHostName(); - logger.debug("Backports server configuration omits host configuration - using autodetected " + host); - } - String port = wsrmConfig.getBackPortsServer().getPort(); - String path = PATH_PREFIX + UUIDGenerator.generateRandomUUIDString(); - this.backPort = new URI("http://" + host + ":" + port + path); - } - catch (URISyntaxException use) - { - logger.warn(use); - throw new RMException(use.getMessage(), use); - } - catch (UnknownHostException uhe) - { - logger.warn(uhe); - throw new RMException(uhe.getMessage(), uhe); - } - } - - public void unassignedMessageReceived() - { - // we can't use objectLock in the method - possible deadlock - this.countOfUnassignedMessagesAvailable.addAndGet(1); - logger.debug("Expected sequence expiration in " + ((System.currentTimeMillis() - this.creationTime) / 1000) + "seconds"); - logger.debug("Unassigned message available in callback handler"); - } - - public final RMConfig getRMConfig() - { - return this.wsrmConfig; - } - - public final Set<Long> getReceivedInboundMessages() - { - return this.receivedInboundMessages; - } - - public final BindingProvider getBindingProvider() - { - return (BindingProvider)this.client; - } - - public final void setFinal() - { - this.isFinal = true; - logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final"); - } - - public final void ackRequested(boolean requested) - { - this.inboundMessageAckRequested.set(requested); - logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages); - } - - public final boolean isAckRequested() - { - return this.inboundMessageAckRequested.get(); - } - - public final void addReceivedInboundMessage(long messageId) - { - this.receivedInboundMessages.add(messageId); - logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId); - } - - public final void addReceivedOutboundMessage(long messageId) - { - this.acknowledgedOutboundMessages.add(messageId); - logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server"); - } - - public final void setOutboundId(String outboundId) - { - this.outgoingSequenceId = outboundId; - } - - public final void setInboundId(String inboundId) - { - this.incomingSequenceId = inboundId; - } - - public final void setClient(ClientImpl client) - { - this.client = client; - } - - public final void setDuration(long duration) - { - if (duration > 0) - { - this.creationTime = System.currentTimeMillis(); - this.duration = duration; - } - } - - public final long getDuration() - { - return this.duration; - } - - public final URI getBackPort() - { - // no need for synchronization - return (this.addressableClient) ? this.backPort : null; - } - - public final long newMessageNumber() - { - // no need for synchronization - return this.messageNumber.incrementAndGet(); - } - - public final long getLastMessageNumber() - { - // no need for synchronization - return this.messageNumber.get(); - } - - public final void close() throws RMException - { - try - { - sendCloseMessage(); - sendTerminateMessage(); - } - finally - { - this.client.setWSRMSequence(null); - } - } - - /** - * Sets up terminated flag to true. - */ - private void sendMessage(String action, QName operationQName, List protocolMessages) throws RMException - { - try - { - // set up addressing properties - String address = client.getEndpointMetaData().getEndpointAddress(); - AddressingProperties props = null; - if (this.client.getWSRMSequence().getBackPort() != null) - { - props = AddressingClientUtil.createDefaultProps(action, address); - props.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.client.getWSRMSequence().getBackPort())); - } - else - { - props = AddressingClientUtil.createAnonymousProps(action, address); - } - // prepare WS-RM request context - Map requestContext = client.getBindingProvider().getRequestContext(); - Map rmRequestContext = (Map)requestContext.get(RMConstant.REQUEST_CONTEXT); - if (rmRequestContext == null) - { - rmRequestContext = new HashMap(); - } - rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); - rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, this); - // set up method invocation context - requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props); - requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext); - // call stub method - this.client.invoke(operationQName, new Object[] {}, client.getBindingProvider().getResponseContext()); - } - catch (Exception e) - { - throw new RMException("Unable to terminate WSRM sequence", e); - } - } - - public final void sendCloseMessage() - { - while (this.isAckRequested()) - { - logger.debug("Waiting till all inbound sequence acknowledgements will be sent"); - sendSequenceAcknowledgementMessage(); - } - Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); - wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false); - this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); - List msgs = new LinkedList(); - msgs.add(wsrmConstants.getCloseSequenceQName()); - sendMessage(RMConstant.CLOSE_SEQUENCE_WSA_ACTION, wsrmConstants.getCloseSequenceQName(), msgs); - } - - public final void sendTerminateMessage() - { - List msgs = new LinkedList(); - msgs.add(wsrmConstants.getTerminateSequenceQName()); - if (this.getInboundId() != null) - { - msgs.add(wsrmConstants.getSequenceAcknowledgementQName()); - } - sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName(), msgs); - } - - public final void sendSequenceAcknowledgementMessage() - { - Map<String, Object> wsrmReqCtx = new HashMap<String, Object>(); - wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true); - this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx); - ackRequested(false); - List msgs = new LinkedList(); - msgs.add(wsrmConstants.getSequenceAcknowledgementQName()); - sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName(), msgs); - } - - public final void setBehavior(RMIncompleteSequenceBehavior behavior) - { - if (behavior != null) - { - this.behavior = behavior; - } - } - - public final String getOutboundId() - { - return outgoingSequenceId; - } - - public final String getInboundId() - { - return incomingSequenceId; - } - -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -30,10 +30,10 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.extensions.wsrm.RMClientHandler; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceImpl; +import org.jboss.ws.extensions.wsrm.RMClientSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.jaxws.RMHandler; import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; @@ -90,7 +90,7 @@ return d.getTimeInMillis(new Date()); } - public static void handleSequenceAcknowledgementHeader(RMSequenceAcknowledgement seqAckHeader, RMSequenceImpl sequence) + public static void handleSequenceAcknowledgementHeader(RMSequenceAcknowledgement seqAckHeader, RMClientSequenceImpl sequence) { String seqId = seqAckHeader.getIdentifier(); if (sequence.getOutboundId().equals(seqId)) @@ -115,7 +115,7 @@ } } - public static void handleAckRequestedHeader(RMAckRequested ackReqHeader, RMSequenceImpl sequence) + public static void handleAckRequestedHeader(RMAckRequested ackReqHeader, RMClientSequenceImpl sequence) { String inboundSeqId = ackReqHeader.getIdentifier(); if (false == sequence.getInboundId().equals(inboundSeqId)) @@ -127,7 +127,7 @@ sequence.ackRequested(true); } - public static void handleSequenceHeader(RMSequence seqHeader, RMSequenceImpl sequence) + public static void handleSequenceHeader(RMSequence seqHeader, RMClientSequenceImpl sequence) { String inboundSeqId = seqHeader.getIdentifier(); if (null == sequence.getInboundId()) Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -0,0 +1,34 @@ +/* + * 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.jaxws; + +/** + * Client WS-RM JAX-WS handler + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 12, 2007 + */ +public final class RMClientHandler extends RMHandler +{ + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -0,0 +1,320 @@ +/* + * 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.jaxws; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.MessageContext.Scope; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.ws.extensions.wsrm.RMConstant; +import org.jboss.ws.extensions.wsrm.RMSequenceIface; +import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.spi.RMConstants; +import org.jboss.ws.extensions.wsrm.spi.RMMessageFactory; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequenceResponse; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequenceResponse; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequence; +import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequenceResponse; + +/** + * RM generic JAX-WS handler + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 23, 2007 + */ +@SuppressWarnings("unchecked") +public class RMHandler extends GenericSOAPHandler +{ + private static final Logger log = Logger.getLogger(RMHandler.class); + private static final RMMessageFactory rmFactory = RMProvider.get().getMessageFactory(); + private static final RMConstants rmConstants = RMProvider.get().getConstants(); + private static final Set headers = RMConstant.PROTOCOL_OPERATION_QNAMES; + + public final Set getHeaders() + { + return headers; + } + + protected final boolean handleOutbound(MessageContext msgContext) + { + log.debug("handling outbound message"); + + CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext; + SOAPAddressingProperties addrProps = (SOAPAddressingProperties)commonMsgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); + if (addrProps == null) + throw new RMException("WS-Addressing properties not found in message context"); + + Map rmRequestContext = (Map)commonMsgContext.get(RMConstant.REQUEST_CONTEXT); + List<QName> outMsgs = (List<QName>)rmRequestContext.get(RMConstant.PROTOCOL_MESSAGES); + Map<QName, RMSerializable> data = new HashMap<QName, RMSerializable>(); + String optionalMessageId = (addrProps.getMessageID() != null) ? addrProps.getMessageID().getURI().toString() : null; + rmRequestContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId); + rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); + SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage(); + RMSequenceIface sequenceImpl = (RMSequenceIface)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE); + + QName msgQName = rmConstants.getCreateSequenceQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize CreateSequence to message + String replyTo = addrProps.getReplyTo().getAddress().getURI().toString(); + RMCreateSequence createSequence = rmFactory.newCreateSequence(); + createSequence.setAcksTo(replyTo); + createSequence.serializeTo(soapMessage); + data.put(msgQName, createSequence); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getSequenceQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize Sequence to message + RMSequence sequence = rmFactory.newSequence(); + sequence.setIdentifier(sequenceImpl.getOutboundId()); + sequence.setMessageNumber(sequenceImpl.newMessageNumber()); + sequence.serializeTo(soapMessage); + data.put(msgQName, sequence); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getAckRequestedQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize AckRequested to message + RMAckRequested ackRequested = rmFactory.newAckRequested(); + ackRequested.setIdentifier(sequenceImpl.getOutboundId()); + ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber()); + ackRequested.serializeTo(soapMessage); + data.put(msgQName, ackRequested); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getCloseSequenceQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize CloseSequence to message + RMCloseSequence closeSequence = rmFactory.newCloseSequence(); + closeSequence.setIdentifier(sequenceImpl.getOutboundId()); + closeSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber()); + closeSequence.serializeTo(soapMessage); + data.put(msgQName, closeSequence); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getCloseSequenceResponseQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize CloseSequenceResponse to message + RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse(); + closeSequenceResponse.setIdentifier(sequenceImpl.getOutboundId()); + data.put(msgQName, closeSequenceResponse); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getTerminateSequenceQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize TerminateSequence to message + RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence(); + terminateSequence.setIdentifier(sequenceImpl.getOutboundId()); + terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber()); + terminateSequence.serializeTo(soapMessage); + data.put(msgQName, terminateSequence); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getTerminateSequenceResponseQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize terminateSequenceResponse to message + RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse(); + terminateSequenceResponse.setIdentifier(sequenceImpl.getOutboundId()); + terminateSequenceResponse.serializeTo(soapMessage); + data.put(msgQName, terminateSequenceResponse); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + msgQName = rmConstants.getSequenceAcknowledgementQName(); + if (outMsgs.contains(msgQName)) + { + // try to serialize SequenceAcknowledgement to message + RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement(); + sequenceAcknowledgement.setIdentifier(sequenceImpl.getInboundId()); + Iterator<Long> receivedInboudMessages = sequenceImpl.getReceivedInboundMessages().iterator(); + while (receivedInboudMessages.hasNext()) + { + long messageNo = receivedInboudMessages.next(); + RMSequenceAcknowledgement.RMAcknowledgementRange range = sequenceAcknowledgement.newAcknowledgementRange(); + range.setLower(messageNo); + range.setUpper(messageNo); + sequenceAcknowledgement.addAcknowledgementRange(range); + } + sequenceAcknowledgement.serializeTo(soapMessage); + data.put(msgQName, sequenceAcknowledgement); + log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload"); + } + + // TODO: implement SequenceFault serialization + + return true; + } + + protected final boolean handleInbound(MessageContext msgContext) + { + log.debug("handling inbound message"); + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + Map<String, Object> rmResponseContext = new HashMap(); + List<QName> messages = new LinkedList<QName>(); + rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, messages); + Map<QName, RMSerializable> data = new HashMap<QName, RMSerializable>(); + rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data); + msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); + msgContext.setScope(RMConstant.RESPONSE_CONTEXT, Scope.APPLICATION); + + try + { + // try to deserialize CreateSequenceResponse from message + QName msgQName = rmConstants.getCreateSequenceResponseQName(); + RMCreateSequenceResponse wsrmMsg = rmFactory.newCreateSequenceResponse(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize AckRequested from message + QName msgQName = rmConstants.getAckRequestedQName(); + RMAckRequested wsrmMsg = rmFactory.newAckRequested(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize Sequence from message + QName msgQName = rmConstants.getSequenceQName(); + RMSequence wsrmMsg = rmFactory.newSequence(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize SequenceAcknowledgement from message + QName msgQName = rmConstants.getSequenceAcknowledgementQName(); + RMSequenceAcknowledgement wsrmMsg = rmFactory.newSequenceAcknowledgement(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize CloseSequence from message + QName msgQName = rmConstants.getCloseSequenceQName(); + RMCloseSequence wsrmMsg = rmFactory.newCloseSequence(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize CloseSequence from message + QName msgQName = rmConstants.getCloseSequenceResponseQName(); + RMCloseSequenceResponse wsrmMsg = rmFactory.newCloseSequenceResponse(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize TerminateSequence from message + QName msgQName = rmConstants.getTerminateSequenceQName(); + RMTerminateSequence wsrmMsg = rmFactory.newTerminateSequence(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + try + { + // try to deserialize TerminateSequenceResponse from message + QName msgQName = rmConstants.getTerminateSequenceResponseQName(); + RMTerminateSequenceResponse wsrmMsg = rmFactory.newTerminateSequenceResponse(); + wsrmMsg.deserializeFrom(soapMessage); + messages.add(msgQName); + data.put(msgQName, wsrmMsg); + log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload"); + } + catch (RMException ignore) {} + + // TODO: implement SequenceFault deserialization + + if (data.size() == 0) + throw new RMException("RM handler was not able to find WS-RM message in the payload"); + + return true; + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -0,0 +1,34 @@ +/* + * 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.jaxws; + +/** + * Client WS-RM JAX-WS handler + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 12, 2007 + */ +public final class RMServerHandler extends RMHandler +{ + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -33,7 +33,7 @@ import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; import org.jboss.ws.core.MessageTrace; -import org.jboss.ws.extensions.wsrm.RMSequenceImpl; +import org.jboss.ws.extensions.wsrm.RMClientSequenceImpl; import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandler; import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandlerFactory; @@ -78,7 +78,7 @@ if (backPort != null) { callbackHandler = RMCallbackHandlerFactory.getCallbackHandler(backPort); - RMSequenceImpl sequence = RMTransportHelper.getSequence(rmRequest); + RMClientSequenceImpl sequence = RMTransportHelper.getSequence(rmRequest); if (sequence != null) { callbackHandler.addUnassignedMessageListener(sequence); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-12 12:37:50 UTC (rev 5265) @@ -7,7 +7,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.RMSequenceImpl; +import org.jboss.ws.extensions.wsrm.RMClientSequenceImpl; /** * Utility class heavily used in this transport implementation @@ -45,9 +45,9 @@ return (Map<String, Object>)invocationCtx.get(REQUEST_CONTEXT); } - public static RMSequenceImpl getSequence(RMMessage rmRequest) + public static RMClientSequenceImpl getSequence(RMMessage rmRequest) { - return (RMSequenceImpl)getWsrmRequestContext(rmRequest).get(SEQUENCE_REFERENCE); + return (RMClientSequenceImpl)getWsrmRequestContext(rmRequest).get(SEQUENCE_REFERENCE); } public static boolean isOneWayOperation(RMMessage rmRequest) Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-12-12 08:22:15 UTC (rev 5264) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-12-12 12:37:50 UTC (rev 5265) @@ -21,7 +21,7 @@ </javaee:handler> <javaee:handler> <javaee:handler-name>WSRM Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.wsrm.RMClientHandler</javaee:handler-class> + <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMClientHandler</javaee:handler-class> </javaee:handler> </javaee:handler-chain> </post-handler-chains>

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5264 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-12 03:22:15 -0500 (Wed, 12 Dec 2007) New Revision: 5264 Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix deploy-jboss423 Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-12-12 08:21:19 UTC (rev 5263) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-12-12 08:22:15 UTC (rev 5264) @@ -68,6 +68,23 @@ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> +  + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423"> + <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> + </target> + <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + </target> + + <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/native from jboss423"> + <macro-undeploy-native423/> + <macro-undeploy-framework jbosshome="${jboss423.home}"/> + </target> + <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> + </target> +  <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500"> <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5263 - in stack/native/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-12 03:21:19 -0500 (Wed, 12 Dec 2007) New Revision: 5263 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/ant.properties.example Log: Fix deploy-jboss423 Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -77,8 +77,8 @@  <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> -  - <macro-deploy-native422 jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss423.home}"/> </target> @@ -88,8 +88,8 @@  <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423"> -  - <macro-undeploy-native422 jbosshome="${jboss423.home}"/> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-native423/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> <target name="undeploy-jboss423-endorsed" depends="prepare"> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/build-setup.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -42,6 +42,12 @@ <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -54,12 +60,14 @@ <property name="jboss405.available.file" value="${jboss405.client}/jboss-client.jar"/> <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> <available property="jboss405.available" file="${jboss405.available.file}"/> <available property="jboss405.ejb3.available" file="${jboss405.client}/jboss-ejb3-client.jar"/> <available property="jboss421.available" file="${jboss421.available.file}"/> <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <condition property="jbossws.integration.jboss40" value="true"> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-12-12 08:21:19 UTC (rev 5263) @@ -401,6 +401,104 @@ </macrodef>  +  +  + + <macrodef name="macro-deploy-native423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + +  + <unzip dest="${jboss423.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + +  + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native423"> + <sequential> + + <delete> + +  + <fileset dir="${jboss423.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss423.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss423.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss423.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +    Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-12-12 00:06:42 UTC (rev 5262) +++ stack/native/trunk/ant.properties.example 2007-12-12 08:21:19 UTC (rev 5263) @@ -11,7 +11,7 @@ #jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA #jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500] +# The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss423|jboss500] jbossws.integration.target=jboss500 # The JBoss server instance

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5262 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: management and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2007-12-11 19:06:42 -0500 (Tue, 11 Dec 2007) New Revision: 5262 Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java Log: Implemented MessageBufferRecord and temporarily added some methods in the managed endpoint Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-11 22:29:42 UTC (rev 5261) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-12-12 00:06:42 UTC (rev 5262) @@ -26,8 +26,8 @@ import java.util.LinkedList; import java.util.List; +import org.jboss.wsf.framework.management.recording.RecordBufferProcessor; import org.jboss.wsf.framework.management.recording.RecordDumpProcessor; -import org.jboss.wsf.framework.management.recording.RecordWriterProcessor; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; @@ -79,7 +79,7 @@ //TODO!! still to be configured... List<RecordProcessor> recordProcessorList = new LinkedList<RecordProcessor>(); - recordProcessorList.add(new RecordWriterProcessor()); + recordProcessorList.add(new RecordBufferProcessor()); recordProcessorList.add(new RecordDumpProcessor()); ep.setRecordProcessors(recordProcessorList); Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-11 22:29:42 UTC (rev 5261) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-12 00:06:42 UTC (rev 5262) @@ -24,7 +24,10 @@ // $Id: ManagedEndpointRegistry.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $ import java.util.Date; +import java.util.List; +import java.util.Set; +import org.jboss.wsf.framework.management.recording.RecordBufferProcessor; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.recording.Record; @@ -129,4 +132,36 @@ } } } + + public void addRecordProcessor(RecordProcessor processor) + { + this.getRecordProcessors().add(processor); + } + + public List<RecordProcessor> getRecordProcessors() + { + return endpoint.getRecordProcessors(); + } + + public void setRecordProcessors(List<RecordProcessor> processor) + { + endpoint.setRecordProcessors(processor); + } + + public String getClientHosts() + { + StringBuffer result = new StringBuffer(); + for (RecordProcessor processor : endpoint.getRecordProcessors()) + { + if (processor instanceof RecordBufferProcessor) + { + Set<String> set = ((RecordBufferProcessor)processor).getClientHosts(); + for (String s : set) + { + result.append(s+" "); + } + } + } + return result.toString(); + } } Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-11 22:29:42 UTC (rev 5261) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointMBean.java 2007-12-12 00:06:42 UTC (rev 5262) @@ -22,8 +22,10 @@ package org.jboss.wsf.framework.management; import java.util.Date; +import java.util.List; import org.jboss.wsf.spi.management.recording.Record; +import org.jboss.wsf.spi.management.recording.RecordProcessor; /** * MBean interface. @@ -58,4 +60,12 @@ void setRecording(boolean value); void processRecord(Record record); + + void addRecordProcessor(RecordProcessor processor); + + List<RecordProcessor> getRecordProcessors(); + + void setRecordProcessors(List<RecordProcessor> processors); + + public String getClientHosts(); } Added: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java (rev 0) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java 2007-12-12 00:06:42 UTC (rev 5262) @@ -0,0 +1,121 @@ +/* + * 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.wsf.framework.management.recording; + +//$Id$ + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; + +import org.jboss.wsf.spi.management.recording.Record; +import org.jboss.wsf.spi.management.recording.Record.MessageType; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 12-Dec-2007 + */ +public class RecordBufferProcessor extends AbstractRecordProcessor +{ + + private Map<Long, List<Record>> recentRecords = Collections.synchronizedMap(new HashMap<Long, List<Record>>()); + private ConcurrentLinkedQueue<Long> recentRecordGroups = new ConcurrentLinkedQueue<Long>(); + private int size = 0; + + private int maxSize = 50; + + @Override + public void processRecord(Record record) + { + synchronized (recentRecords) + { + if (size >= maxSize) + { + Long id = recentRecordGroups.poll(); + if (id != null) + { + recentRecords.remove(id); + size--; + } + } + List<Record> list = recentRecords.get(record.getGroupID()); + if (list == null) + { + list = new LinkedList<Record>(); + recentRecords.put(record.getGroupID(), list); + } + list.add(record); + size++; + } + } + + public Map<Long, List<Record>> getRecentRecords() + { + synchronized (recentRecords) + { + return new HashMap<Long, List<Record>>(recentRecords); + } + } + + public Set<String> getClientHosts() + { + Map<Long, List<Record>> map = this.getRecentRecords(); + Set<String> hosts = new HashSet<String>(); + for (List<Record> list : map.values()) + { + for (Record record : list) + { + if (MessageType.INBOUND.equals(record.getMessageType()) && record.getSourceHost() != null) + { + hosts.add(record.getSourceHost()); + } + } + } + return hosts; + } + + public Map<Long, List<Record>> getRecords(String clientHost) + { + Map<Long, List<Record>> map = this.getRecentRecords(); + Map<Long, List<Record>> result = new HashMap<Long, List<Record>>(); + for (List<Record> list : map.values()) + { + for (Record record : list) + { + if (MessageType.INBOUND.equals(record.getMessageType()) + && ((clientHost == null && record.getSourceHost() == null) || clientHost.equalsIgnoreCase(record.getSourceHost()))) + { + result.put(record.getGroupID(), list); + break; + } + } + } + return result; + } + +} Property changes on: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordBufferProcessor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5261 - in stack/native/trunk/src/main: java/org/jboss/ws/core/server and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-11 17:29:42 -0500 (Tue, 11 Dec 2007) New Revision: 5261 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/trunk/src/main/resources/jbossws-native-config.xml Log: introducing RM deployment aspect + adding some RM related hacks + some minor refactorings Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -73,6 +73,7 @@ import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.utils.MimeUtils; import org.jboss.ws.extensions.wsrm.RMConstant; +import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; @@ -172,13 +173,10 @@ if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null) { - for (QName wsrmQN : RMConstant.PROTOCOL_OPERATION_QNAMES) + // RM hack to JAX-RPC serialization + if (RMHelper.isRMOperation(opMetaData.getQName())) { - if (wsrmQN.equals(opMetaData.getQName())) - { - serialize = false; - break; - } + serialize = false; } } @@ -373,7 +371,7 @@ if (node instanceof SOAPElement) numChildElements++; } - if (numChildElements != numParameters) + if (numChildElements != numParameters && (RMHelper.isRMOperation(opMetaData.getQName()) == false)) throw new WSException("Invalid number of payload elements: " + numChildElements); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -342,31 +342,39 @@ { Class implClass = endpoint.getTargetBeanClass(); Method seiMethod = sepInv.getJavaMethod(); + Method implMethod = null; - String methodName = seiMethod.getName(); - Class[] paramTypes = seiMethod.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) + if (seiMethod != null) // RM hack { - Class paramType = paramTypes[i]; - if (JavaUtils.isPrimitive(paramType) == false) + String methodName = seiMethod.getName(); + Class[] paramTypes = seiMethod.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) { - String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); - paramTypes[i] = paramType; + Class paramType = paramTypes[i]; + if (JavaUtils.isPrimitive(paramType) == false) + { + String paramTypeName = paramType.getName(); + paramType = JavaUtils.loadJavaType(paramTypeName); + paramTypes[i] = paramType; + } } - } - Method implMethod = null; - try - { - implMethod = implClass.getMethod(methodName, paramTypes); + try + { + implMethod = implClass.getMethod(methodName, paramTypes); + } + catch (NoSuchMethodException ex) + { + log.error("CodeSource: " + implClass.getProtectionDomain().getCodeSource()); + log.error("ClassLoader: " + implClass.getClassLoader()); + throw ex; + } } - catch (NoSuchMethodException ex) + else { - log.error("CodeSource: " + implClass.getProtectionDomain().getCodeSource()); - log.error("ClassLoader: " + implClass.getClassLoader()); - throw ex; + log.debug("RM method returned as null"); } + return implMethod; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -27,14 +27,19 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; +import javax.xml.namespace.QName; import org.jboss.logging.Logger; import org.jboss.ws.extensions.wsrm.RMClientHandler; +import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.RMSequenceImpl; import org.jboss.ws.extensions.wsrm.api.RMException; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.extensions.wsrm.spi.protocol.RMAckRequested; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence; import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.OperationMetaData; /** * RM utility library @@ -140,4 +145,38 @@ sequence.addReceivedInboundMessage(seqHeader.getMessageNumber()); } + public static void setupRMOperations(EndpointMetaData endpointMD) + { + RMProvider rmProvider = RMProvider.get(); + + // register createSequence method + QName createSequenceQName = rmProvider.getConstants().getCreateSequenceQName(); + OperationMetaData createSequenceMD = new OperationMetaData(endpointMD, createSequenceQName, "createSequence"); + createSequenceMD.setOneWay(false); + endpointMD.addOperation(createSequenceMD); + + // register sequenceAcknowledgement method + QName sequenceAcknowledgementQName = rmProvider.getConstants().getSequenceAcknowledgementQName(); + OperationMetaData sequenceAcknowledgementMD = new OperationMetaData(endpointMD, sequenceAcknowledgementQName, "sequenceAcknowledgement"); + sequenceAcknowledgementMD.setOneWay(true); + endpointMD.addOperation(sequenceAcknowledgementMD); + + // register closeSequence method + QName closeSequenceQName = rmProvider.getConstants().getCloseSequenceQName(); + OperationMetaData closeSequenceMD = new OperationMetaData(endpointMD, closeSequenceQName, "closeSequence"); + closeSequenceMD.setOneWay(false); + endpointMD.addOperation(closeSequenceMD); + + // register terminateSequence method + QName terminateSequenceQName = rmProvider.getConstants().getTerminateSequenceQName(); + OperationMetaData terminateSequenceMD = new OperationMetaData(endpointMD, terminateSequenceQName, "terminateSequence"); + terminateSequenceMD.setOneWay(false); + endpointMD.addOperation(terminateSequenceMD); + } + + public static boolean isRMOperation(QName operationQName) + { + return RMConstant.PROTOCOL_OPERATION_QNAMES.contains(operationQName); + } + } Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -0,0 +1,78 @@ +/* + * 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.server; + +import org.jboss.ws.extensions.wsrm.common.RMHelper; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * Registers RMInvocationHandler if WS-RM is detected + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 11, 2007 + */ +public final class RMDeploymentAspect extends DeploymentAspect +{ + + @Override + public final void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + if (sepMetaData.getConfig().getRMMetaData() != null) + { + InvocationHandler origInvHandler = ep.getInvocationHandler(); + InvocationHandler wsrmInvHandler = new RMInvocationHandler(origInvHandler); + ep.setInvocationHandler(wsrmInvHandler); + RMHelper.setupRMOperations(sepMetaData); + } + } + } + + @Override + public final void destroy(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + InvocationHandler invHandler = ep.getInvocationHandler(); + if (invHandler instanceof RMInvocationHandler) + { + RMInvocationHandler rmInvHandler = (RMInvocationHandler)invHandler; + ep.setInvocationHandler(rmInvHandler.getDelegate()); + } + } + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -0,0 +1,87 @@ +/* + * 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.server; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * RM Invocation Handler + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 11, 2007 + */ +public final class RMInvocationHandler extends InvocationHandler +{ + + private static final Logger logger = Logger.getLogger(RMInvocationHandler.class); + + private final InvocationHandler delegate; + + RMInvocationHandler(InvocationHandler delegate) + { + this.delegate = delegate; + } + + @Override + public final Invocation createInvocation() + { + return this.delegate.createInvocation(); + } + + @Override + public final void handleInvocationException(Throwable th) throws Exception + { + // TODO is it necessary to handle it specially in the case of WS-RM ? + super.handleInvocationException(th); + } + + @Override + public final void init(Endpoint ep) + { + this.delegate.init(ep); + } + + @Override + public final void invoke(Endpoint ep, Invocation inv) throws Exception + { + // TODO: do WS-RM magic here (such as create, close or terminate sequence + if (inv.getJavaMethod() != null) + { + logger.debug("Invoking method: " + inv.getJavaMethod().getName()); + this.delegate.invoke(ep, inv); + } + else + { + logger.debug("RM protocol method detected"); + } + } + + public final InvocationHandler getDelegate() + { + return this.delegate; + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -36,6 +36,7 @@ import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.soap.Style; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; +import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -113,35 +114,6 @@ } } - private void setupRMOperations(EndpointMetaData endpointMD) - { - RMProvider rmProvider = RMProvider.get(); - - // register createSequence method - QName createSequenceQName = rmProvider.getConstants().getCreateSequenceQName(); - OperationMetaData createSequenceMD = new OperationMetaData(endpointMD, createSequenceQName, "createSequence"); - createSequenceMD.setOneWay(false); - endpointMD.addOperation(createSequenceMD); - - // register sequenceAcknowledgement method - QName sequenceAcknowledgementQName = rmProvider.getConstants().getSequenceAcknowledgementQName(); - OperationMetaData sequenceAcknowledgementMD = new OperationMetaData(endpointMD, sequenceAcknowledgementQName, "sequenceAcknowledgement"); - sequenceAcknowledgementMD.setOneWay(true); - endpointMD.addOperation(sequenceAcknowledgementMD); - - // register closeSequence method - QName closeSequenceQName = rmProvider.getConstants().getCloseSequenceQName(); - OperationMetaData closeSequenceMD = new OperationMetaData(endpointMD, closeSequenceQName, "closeSequence"); - closeSequenceMD.setOneWay(false); - endpointMD.addOperation(closeSequenceMD); - - // register terminateSequence method - QName terminateSequenceQName = rmProvider.getConstants().getTerminateSequenceQName(); - OperationMetaData terminateSequenceMD = new OperationMetaData(endpointMD, terminateSequenceQName, "terminateSequence"); - terminateSequenceMD.setOneWay(false); - endpointMD.addOperation(terminateSequenceMD); - } - /** Build from WSDL and service name */ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) @@ -346,7 +318,7 @@ // wsrm initialization if (epMetaData.getConfig().getRMMetaData() != null) { - setupRMOperations(epMetaData); + RMHelper.setupRMOperations(epMetaData); } if(log.isDebugEnabled()) log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData()); Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-12-11 22:29:42 UTC (rev 5261) @@ -37,6 +37,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; +import org.jboss.ws.extensions.wsrm.RMConstant; +import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.wsf.common.JavaUtils; import org.jboss.wsf.common.ResourceLoaderAdapter; @@ -185,7 +187,7 @@ } } - if (tmpMethod == null) + if ((tmpMethod == null) && (epMetaData.getConfig().getRMMetaData() == null)) // RM hack throw new WSException("Cannot find java method: " + javaName); } return tmpMethod; @@ -474,7 +476,8 @@ } // Report unsynchronized java method - if (javaMethod == null) + boolean isRMMethod = RMProvider.get().getConstants().getNamespaceURI().equals(qname.getNamespaceURI()); + if ((javaMethod == null) && (isRMMethod == false)) // RM hack { StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:"); for (Method method : unsynchronizedMethods) Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-12-11 21:14:35 UTC (rev 5260) +++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2007-12-11 22:29:42 UTC (rev 5261) @@ -69,6 +69,10 @@ <property name="requires">UnifiedMetaDataModel</property> </bean> + <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> + <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> + </bean> + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> <property name="provides">UnifiedMetaDataModel</property> @@ -100,6 +104,7 @@ <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> @@ -119,6 +124,7 @@ <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> </set> @@ -137,10 +143,11 @@ <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> <inject bean="WSJAXBIntroDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerEndpointAPI</depends> </bean> - \ No newline at end of file +

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5260 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-11 16:14:35 -0500 (Tue, 11 Dec 2007) New Revision: 5260 Modified: stack/native/trunk/version.properties Log: fixing framework version to be used Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-12-11 15:07:35 UTC (rev 5259) +++ stack/native/trunk/version.properties 2007-12-11 21:14:35 UTC (rev 5260) @@ -26,7 +26,7 @@ # Dependend integration projects jbossws-spi=snapshot jbossws-common=snapshot -jbossws-framework=2.0.2.GA +jbossws-framework=snapshot jbossws-jboss40=4.0.5.GA jbossws-jboss42=4.2.1.GA

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5259 - spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2007-12-11 10:07:35 -0500 (Tue, 11 Dec 2007) New Revision: 5259 Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java Log: Missing date processing conf Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java =================================================================== --- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-11 14:56:12 UTC (rev 5258) +++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-11 15:07:35 UTC (rev 5259) @@ -57,5 +57,6 @@ public void setProcessHeaders(boolean value); public boolean isProcessOperation(); public void setProcessOperation(boolean value); - + public boolean isProcessDate(); + public void setProcessDate(boolean value); }

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5258 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: management/recording and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2007-12-11 09:56:12 -0500 (Tue, 11 Dec 2007) New Revision: 5258 Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java Log: Use of process configuration Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-11 14:44:09 UTC (rev 5257) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-11 14:56:12 UTC (rev 5258) @@ -24,6 +24,7 @@ import java.net.URL; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -31,6 +32,7 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -41,6 +43,7 @@ import org.jboss.wsf.spi.invocation.EndpointAssociation; import org.jboss.wsf.spi.management.recording.Record; import org.jboss.wsf.spi.management.recording.RecordGroupAssociation; +import org.jboss.wsf.spi.management.recording.RecordProcessor; import org.jboss.wsf.spi.management.recording.Record.MessageType; import org.jboss.wsf.test.GenericSOAPHandler; @@ -63,7 +66,7 @@ { log.info("*** INBOUND ***"); Endpoint endpoint = EndpointAssociation.getEndpoint(); - if (endpoint.isRecording()) + if (endpoint.isRecording() && endpoint.getRecordProcessors() != null && !endpoint.getRecordProcessors().isEmpty()) { Long groupID = RecordFactory.newGroupID(); RecordGroupAssociation.pushGroupID(groupID);//check, perhaps we should try peeking before pushing... @@ -86,19 +89,27 @@ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS))); record.setMessageType(MessageType.INBOUND); record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION)); - SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; - try + boolean processMessage = false; + for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; ) { - SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope(); - if (soapEnv != null) + processMessage = it.next().isProcessMessage(); + } + if (processMessage) //skip message processing if not required since it's very time-consuming + { + SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; + try { - record.setEnvelope(DOMWriter.printNode(soapEnv, true)); + SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope(); + if (soapEnv != null) + { + record.setEnvelope(DOMWriter.printNode(soapEnv, true)); + } } + catch (SOAPException ex) + { + log.error("Cannot trace SOAPMessage", ex); + } } - catch (SOAPException ex) - { - log.error("Cannot trace SOAPMessage", ex); - } endpoint.processRecord(record); } return true; @@ -109,7 +120,7 @@ { Endpoint endpoint = EndpointAssociation.getEndpoint(); log.info("*** OUTBOUND ***"); - if (endpoint.isRecording()) + if (endpoint.isRecording() && endpoint.getRecordProcessors() != null && !endpoint.getRecordProcessors().isEmpty()) { Long groupID = RecordGroupAssociation.popGroupID();//check, perhaps we should try peeking before popping... Record record = RecordFactory.newRecord(groupID); @@ -117,19 +128,27 @@ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS))); record.setMessageType(MessageType.OUTBOUND); record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION)); - SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; - try + boolean processMessage = false; + for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; ) { - SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope(); - if (soapEnv != null) + processMessage = it.next().isProcessMessage(); + } + if (processMessage) //skip message processing if not required since it's very time-consuming + { + SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; + try { - record.setEnvelope(DOMWriter.printNode(soapEnv, true)); + SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope(); + if (soapEnv != null) + { + record.setEnvelope(DOMWriter.printNode(soapEnv, true)); + } } + catch (SOAPException ex) + { + log.error("Cannot trace SOAPMessage", ex); + } } - catch (SOAPException ex) - { - log.error("Cannot trace SOAPMessage", ex); - } endpoint.processRecord(record); } return true; Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-11 14:44:09 UTC (rev 5257) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-11 14:56:12 UTC (rev 5258) @@ -39,12 +39,13 @@ { protected List<RecordFilter> filters = new Vector<RecordFilter>(); - protected boolean processDestinationHost; - protected boolean processSourceHost; - protected boolean processHeaders; - protected boolean processMessage; - protected boolean processMessageType; - protected boolean processOperation; + protected boolean processDestinationHost = true; + protected boolean processSourceHost = true; + protected boolean processHeaders = true; + protected boolean processMessage = true; + protected boolean processMessageType = true; + protected boolean processOperation = true; + protected boolean processDate = true; public abstract void processRecord(Record record); @@ -122,5 +123,36 @@ { this.processOperation = processOperation; } + + public boolean isProcessDate() + { + return processDate; + } + + public void setProcessDate(boolean processDate) + { + this.processDate = processDate; + } + public String toString() + { + StringBuffer sb = new StringBuffer(); + sb.append(super.toString()); + sb.append(" (processDestinationHost = "); + sb.append(processDestinationHost); + sb.append(", processSourceHost = "); + sb.append(processSourceHost); + sb.append(", processHeaders = "); + sb.append(processHeaders); + sb.append(", processMessage = "); + sb.append(processMessage); + sb.append(", processMessageType = "); + sb.append(processMessageType); + sb.append(", processOperation = "); + sb.append(processOperation); + sb.append(", processDate = "); + sb.append(processDate); + sb.append(")"); + return sb.toString(); + } } Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java 2007-12-11 14:44:09 UTC (rev 5257) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordDumpProcessor.java 2007-12-11 14:56:12 UTC (rev 5258) @@ -45,29 +45,57 @@ public void processRecord(Record record) { StringBuffer sb = new StringBuffer(); - if (record.getMessageType() == MessageType.INBOUND) + if (this.isProcessMessageType()) { - sb.append("INBOUND MESSAGE from "); - sb.append(record.getSourceHost()); + if (record.getMessageType() == MessageType.INBOUND) + { + sb.append("INBOUND MESSAGE "); + if (this.isProcessSourceHost()) + { + sb.append("from "); + sb.append(record.getSourceHost()); + } + } + else if (record.getMessageType() == MessageType.OUTBOUND) + { + sb.append("OUTBOUND MESSAGE "); + if (this.isProcessDestinationHost()) + { + sb.append("to "); + sb.append(record.getDestinationHost()); + } + } + else + { + log.warn("Unknown message type: " + record.getMessageType()); + if (this.isProcessSourceHost()) + { + sb.append("from "); + sb.append(record.getSourceHost()); + } + if (this.isProcessDestinationHost()) + { + sb.append("to "); + sb.append(record.getDestinationHost()); + } + } } - else if (record.getMessageType() == MessageType.OUTBOUND) + sb.append(":"); + if (this.isProcessDate()) { - sb.append("OUTBOUND MESSAGE to "); - sb.append(record.getDestinationHost()); + sb.append("\nDate: "); + sb.append(record.getDate()); } - else + sb.append("\nGroupID: "); + sb.append(record.getGroupID()); + if (this.isProcessOperation()) { - log.warn("Unknown message type: " + record.getMessageType()); + sb.append("\nOperation: "); + sb.append(record.getOperation()); } - sb.append(": \nDate: "); - sb.append(record.getDate()); - sb.append("\nGroupID: "); - sb.append(record.getGroupID()); - sb.append("\nOperation: "); - sb.append(record.getOperation()); - sb.append("\n\n"); + sb.append("\n"); Map<String, List<String>> headers = record.getHeaders(); - if (headers != null) + if (this.isProcessHeaders() && headers != null) { for (String key : headers.keySet()) { @@ -80,24 +108,28 @@ } sb.append("\n"); } + sb.append("\n"); } sb.append("\n"); - if (record.getPayload() != null) + if (this.isProcessMessage()) { - try + if (record.getPayload() != null) { - ByteArrayOutputStream out = new ByteArrayOutputStream(1024); - out.write(record.getPayload()); - out.close(); - sb.append(out.toString()); //improve this... - sb.append("\n"); + try + { + ByteArrayOutputStream out = new ByteArrayOutputStream(1024); + out.write(record.getPayload()); + out.close(); + sb.append(out.toString()); //improve this... + sb.append("\n"); + } + catch (IOException e) + { + log.warn("Error while writing the payload!"); + } } - catch (IOException e) - { - log.warn("Error while writing the payload!"); - } + sb.append(record.getEnvelope()); } - sb.append(record.getEnvelope()); log.debug(sb.toString()); } } Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java 2007-12-11 14:44:09 UTC (rev 5257) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordWriterProcessor.java 2007-12-11 14:56:12 UTC (rev 5258) @@ -38,7 +38,8 @@ @Override public void processRecord(Record arg0) { - log.info("processerei il messaggio..."); + log.info("TODO"); + log.info(this); } }

18 years, 4 months

1
0
0 / 0

JBossWS SVN: r5257 - in framework/trunk/hudson/hudson-home/jobs: Metro-ALL and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-11 09:44:09 -0500 (Tue, 11 Dec 2007) New Revision: 5257 Added: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/Native-ALL/ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml Log: Restructure hudson jobs Added: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2007-12-11 14:44:09 UTC (rev 5257) @@ -0,0 +1,23 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"/> + <publishers class="vector"> + <hudson.tasks.BuildTrigger> + <childProjects>Metro-Distro-AS-4.2.2, Metro-Distro-AS-5.0.0, Metro-Integration-AS-4.2.2, Metro-Integration-AS-5.0.0</childProjects> + </hudson.tasks.BuildTrigger> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>20</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Run all Metro tests</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2007-12-11 14:44:09 UTC (rev 5257) @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"/> + <publishers class="vector"> + <hudson.tasks.BuildTrigger> + <childProjects> + Native-Core-AS-4.0.5, Native-Core-AS-4.0.5-No-EJB3, Native-Core-AS-4.2.1, Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-5.0.0, + Native-Distro-AS-4.0.5, Native-Distro-AS-4.0.5-No-EJB3, Native-Distro-AS-4.2.1, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-5.0.0, + Native-Integration-AS-4.0.5, Native-Integration-AS-4.0.5-No-EJB3, Native-Integration-AS-4.2.1, Native-Integration-AS-4.2.2, Native-Integration-AS-5.0.0 + </childProjects> + </hudson.tasks.BuildTrigger> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>-1</daysToKeep> + <numToKeep>20</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Run all CXF tests</description> + <actions class="vector"/> +</project> Property changes on: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2007