JBossWS SVN: r13516 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws: jbws2014 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2010-12-17 01:22:05 -0500 (Fri, 17 Dec 2010)
New Revision: 13516
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
Log:
[JBPAPP-5597] MTOM + WS-Security not working
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2010-12-17 06:22:05 UTC (rev 13516)
@@ -0,0 +1,128 @@
+/*
+ * 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.jbws2014;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test JBWS-2014 (WS-Security with MTOM) - signature + encryption
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-May-2008
+ */
+public class EncryptTestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(EncryptTestCase.class, "jaxws-jbws2014-encrypt.jar");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testEndpoint() throws Exception
+ {
+ TestDto in0 = new TestDto();
+ in0.setId("myId");
+ String text = "This is the attachment for id: myId";
+ in0.setContent(new DataHandler(text, "text/plain"));
+ TestEndpoint port = getPort();
+ TestDto retObj = port.echo(in0);
+
+ Map<String, Object> ctx = ((BindingProvider)port).getResponseContext();
+ Object resContentType = ((HashMap<String,Object>)ctx.get("javax.xml.ws.http.response.headers")).get("Content-Type");
+
+ //Inline data when using encryption
+ assertTrue(resContentType.toString().contains("text/xml"));
+ assertTrue(!resContentType.toString().contains("multipart"));
+
+
+ assertEquals("myId", retObj.getId());
+ Object result = retObj.getContent().getContent();
+ if (result instanceof InputStream)
+ {
+ InputStream in = (InputStream)result;
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
+ }
+ result = out.toString();
+ }
+ assertEquals(text, result);
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+ System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath());
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl");
+ URL securityURL = getResourceURL("jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ return port;
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ return file;
+ }
+
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2010-12-17 06:22:05 UTC (rev 13516)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2014;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test JBWS-2014 (WS-Security with MTOM) - signature
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-May-2008
+ */
+public class SignTestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(SignTestCase.class, "jaxws-jbws2014-sign.jar");
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testEndpoint() throws Exception
+ {
+ TestDto in0 = new TestDto();
+ in0.setId("myId");
+ String text = "This is the attachment for id: myId";
+ //This also tests JBWS-2172
+ in0.setContent(new DataHandler(text, "text/plain"));
+ TestEndpoint port = getPort();
+ TestDto retObj = port.echo(in0);
+
+ Map<String, Object> ctx = ((BindingProvider)port).getResponseContext();
+ Object resContentType = ((HashMap<String,Object>)ctx.get("javax.xml.ws.http.response.headers")).get("Content-Type");
+ //Check attachment
+ assertTrue(resContentType.toString().contains("multipart"));
+
+ assertEquals("myId", retObj.getId());
+ Object result = retObj.getContent().getContent();
+ if (result instanceof InputStream)
+ {
+ InputStream in = (InputStream)result;
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
+ }
+ result = out.toString();
+ }
+ assertEquals(text, result);
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+ System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath());
+ System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath());
+ System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws");
+ System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks");
+ System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks");
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl");
+ URL securityURL = getResourceURL("jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ return port;
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ return file;
+ }
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestDto.java 2010-12-17 06:22:05 UTC (rev 13516)
@@ -0,0 +1,28 @@
+package org.jboss.test.ws.jaxws.jbws2014;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+
+public class TestDto
+{
+ private DataHandler content;
+ private String id;
+
+ @XmlMimeType("text/plain")
+ public DataHandler getContent()
+ {
+ return content;
+ }
+ public void setContent(DataHandler content)
+ {
+ this.content = content;
+ }
+ public String getId()
+ {
+ return id;
+ }
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpoint.java 2010-12-17 06:22:05 UTC (rev 13516)
@@ -0,0 +1,35 @@
+/*
+ * 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.jbws2014;
+
+//$Id: TestEndpoint.java 6872 2008-05-02 17:49:10Z alessio.soldano(a)jboss.com $
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jbws2014")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT,
+ use = SOAPBinding.Use.LITERAL)
+public interface TestEndpoint
+{
+ public TestDto echo(TestDto dto);
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2010-12-17 06:22:05 UTC (rev 13516)
@@ -0,0 +1,55 @@
+/*
+ * 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.jbws2014;
+
+//$Id: TestEndpointImpl.java 6872 2008-05-02 17:49:10Z alessio.soldano(a)jboss.com $
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * The MTOM endpoint
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 01-May-2008
+ */
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws2014.TestEndpoint",
+ name = "TestEndpoint",
+ targetNamespace = "http://org.jboss.ws/jbws2014",
+ serviceName = "TestService")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
+@WebContext(contextRoot="/jaxws-jbws2014", urlPattern="/*")
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class TestEndpointImpl
+{
+ public TestDto echo(TestDto dto)
+ {
+ return dto;
+ }
+}
14 years
JBossWS SVN: r13515 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2010-12-16 15:04:23 -0500 (Thu, 16 Dec 2010)
New Revision: 13515
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-client-config.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
Log:
[JBPAPP-5597] MTOM + WS-Security not working
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-12-16 20:04:23 UTC (rev 13515)
@@ -393,7 +393,33 @@
<include name="org/jboss/test/ws/jaxws/jbws1283/*.*" />
</fileset>
</jar>
-
+
+ <!-- jaxws-jbws2014-->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws2014-sign.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/sign/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws2014-encrypt.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2014/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/encrypt/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws2014/">
+ <include name="wsse.*"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-jbws1422 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/CommonClient.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/CommonClient.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -54,6 +54,7 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -298,6 +299,8 @@
boolean handlerPass = callRequestHandlerChain(portName, handlerType[0]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]);
+
+ XOPContext.visitAndRestoreXOPData();
// Handlers might have replaced the message
reqMessage = msgContext.getMessageAbstraction();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -560,12 +560,7 @@
{
SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext();
HandlerChainBaseImpl handlerChain = (HandlerChainBaseImpl)jaxrpcService.getHandlerChain(portName);
- boolean status = (handlerChain != null ? handlerChain.handleRequest(msgContext, type) : true);
-
- if (type == HandlerType.ENDPOINT)
- XOPContext.visitAndRestoreXOPData();
-
- return status;
+ return (handlerChain != null ? handlerChain.handleRequest(msgContext, type) : true);
}
@Override
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -70,6 +70,7 @@
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
@@ -226,6 +227,8 @@
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]);
handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]);
+ XOPContext.visitAndRestoreXOPData();
+
// Handlers might have replaced the message
reqMsg = (SOAPMessageImpl)msgContext.getSOAPMessage();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -28,13 +28,17 @@
import java.util.Set;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.PortInfo;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.server.ServerHandlerDelegate;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -100,7 +104,13 @@
log.debug("callResponseHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
- return (executor != null ? executor.handleMessage(msgContext) : true);
+ boolean status = (executor != null ? executor.handleMessage(msgContext) : true);
+
+ MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
+ if (msg instanceof SOAPMessage)
+ XOPContext.visitAndRestoreXOPData();
+
+ return status;
}
public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type)
@@ -120,7 +130,13 @@
log.debug("callFaultHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
- return (executor != null ? executor.handleFault(msgContext, ex) : true);
+ boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true);
+
+ MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
+ if (msg instanceof SOAPMessage)
+ XOPContext.visitAndRestoreXOPData();
+
+ return status;
}
private List<Handler> getHandlerChain(EndpointMetaData epMetaData, HandlerType type)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -22,8 +22,10 @@
package org.jboss.ws.core.soap;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
@@ -66,6 +68,8 @@
protected org.w3c.dom.Node domNode;
// A list of soap children
private List<NodeImpl> soapChildren = new ArrayList<NodeImpl>();
+ // A hash with the user data
+ private Map<String, Object> userData;
/** Construct the Node for a given org.w3c.dom.Node
*
@@ -612,8 +616,11 @@
public Object getUserData(String key)
{
- // FIXME getUserData
- throw new NotImplementedException("getUserData");
+ if (userData != null)
+ {
+ return userData.get(key);
+ }
+ return null;
}
public boolean isDefaultNamespace(String namespaceURI)
@@ -662,8 +669,11 @@
public Object setUserData(String key, Object data, UserDataHandler handler)
{
- // FIXME setUserData
- throw new NotImplementedException("setUserData");
+ if (userData == null)
+ {
+ userData = new HashMap<String, Object>();
+ }
+ return userData.put(key, data);
}
// END org.w3c.dom.Node DOM Level 3 *****************************************************************************
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -33,6 +33,8 @@
import javax.xml.soap.SOAPFault;
import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -136,6 +138,8 @@
{
SOAPElement soapChild = createElement((Element)child);
soapElement.addChildElement(soapChild);
+ if (Constants.NAME_XOP_INCLUDE.equals(soapChild.getElementQName()))
+ XOPContext.inlineXOPData(soapChild);
}
else if (nodeType == Node.TEXT_NODE)
{
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2010-12-16 20:04:23 UTC (rev 13515)
@@ -72,6 +72,8 @@
private static final Logger log = Logger.getLogger(XOPContext.class);
private static final String NS_XOP_JBOSSWS = "http://org.jboss.ws/xop";
+
+ private static final String NS_XOP_JBOSSWS_CONTENT_TYPE = NS_XOP_JBOSSWS + ":content-type";
/**
* Check if the current soap message flagged as a XOP package.
@@ -258,11 +260,11 @@
*/
public static void restoreXOPDataDOM(SOAPElement xopElement)
{
- String contentType = xopElement.getAttributeNS(NS_XOP_JBOSSWS, "content-type");
+ String contentType = (String)xopElement.getUserData(NS_XOP_JBOSSWS_CONTENT_TYPE);
if (contentType != null && contentType.length() > 0)
{
replaceBase64Representation(xopElement, contentType);
- xopElement.removeAttribute(new NameImpl(new QName(NS_XOP_JBOSSWS, "content-type")));
+ xopElement.setUserData(NS_XOP_JBOSSWS_CONTENT_TYPE, null, null);
}
else
{
@@ -345,7 +347,7 @@
String base64 = SimpleTypeBindings.marshalBase64(data);
parent.removeChild(xopIncludeElement);
parent.setValue(base64);
- parent.setAttributeNS(NS_XOP_JBOSSWS, "content-type", contentType);
+ parent.setUserData(NS_XOP_JBOSSWS_CONTENT_TYPE, contentType, null);
if (log.isDebugEnabled())
log.debug("Created base64 representation for content-type " + contentType);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-client-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-client-config.xml 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-client-config.xml 2010-12-16 20:04:23 UTC (rev 13515)
@@ -36,7 +36,7 @@
<config-name>Standard WSSecurity Client</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2010-12-16 19:45:50 UTC (rev 13514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2010-12-16 20:04:23 UTC (rev 13515)
@@ -35,7 +35,7 @@
<config-name>Standard WSSecurity Endpoint</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurity Handler</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
14 years
JBossWS SVN: r13513 - in stack/cxf: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 07:02:32 -0500 (Thu, 16 Dec 2010)
New Revision: 13513
Added:
stack/cxf/tags/jbossws-cxf-3.4.1.GA/
Removed:
stack/cxf/branches/jbossws-cxf-3.4.1/
Log:
Tagging JBossWS CXF 3.4.1.GA
Copied: stack/cxf/tags/jbossws-cxf-3.4.1.GA (from rev 13512, stack/cxf/branches/jbossws-cxf-3.4.1)
14 years
JBossWS SVN: r13512 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:49:05 -0500 (Thu, 16 Dec 2010)
New Revision: 13512
Added:
stack/native/tags/jbossws-native-3.4.1.GA/
Removed:
stack/native/branches/jbossws-native-3.4.1/
Log:
tagging JBossWS Native 3.4.1.GA
Copied: stack/native/tags/jbossws-native-3.4.1.GA (from rev 13511, stack/native/branches/jbossws-native-3.4.1)
14 years
JBossWS SVN: r13511 - in stack/cxf/branches/jbossws-cxf-3.4.1: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:34:06 -0500 (Thu, 16 Dec 2010)
New Revision: 13511
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
Log:
prepare for JBossWS CXF 3.4.1.GA tagging
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-16 11:21:51 UTC (rev 13510)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-16 11:34:06 UTC (rev 13511)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.4.1.GA</url>
</scm>
<!-- Modules -->
@@ -46,15 +46,15 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version>
- <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.spi.version>1.4.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.4.1.GA</jbossws.common.version>
+ <jbossws.framework.version>3.4.1.GA</jbossws.framework.version>
+ <jbossws.jboss501.version>3.4.0.GA</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.4.0.GA</jbossws.jboss510.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
- <jbossws.jboss600M5.version>3.4.1-SNAPSHOT</jbossws.jboss600M5.version>
+ <jbossws.jboss600M5.version>3.4.1.GA</jbossws.jboss600M5.version>
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
14 years
JBossWS SVN: r13510 - stack/cxf/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:21:51 -0500 (Thu, 16 Dec 2010)
New Revision: 13510
Modified:
stack/cxf/trunk/src/main/distro/ReleaseNotes.txt
Log:
updating release notes
Modified: stack/cxf/trunk/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/ReleaseNotes.txt 2010-12-16 11:20:47 UTC (rev 13509)
+++ stack/cxf/trunk/src/main/distro/ReleaseNotes.txt 2010-12-16 11:21:51 UTC (rev 13510)
@@ -50,6 +50,27 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--------------------
+jbossws-cxf-3.4.1.GA
+--------------------
+
+Feature Request
+
+ * [JBWS-3139] - Ensure IPv6 Compatibility
+ * [JBWS-3161] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation
+ * [JBWS-3181] - Add support for symlinked bin/*.sh files
+
+Task
+
+ * [JBWS-2896] - Fix unguarded calls to Logger.debug()
+ * [JBWS-3171] - Fix WebServiceContext injection into EJB3 beans
+ * [JBWS-3177] - Provide CDI Integration Points
+ * [JBWS-3179] - InvocationHandlerJAXWS is responsible for endpoint injections & lifecycle
+
+Errata
+
+ See: https://issues.jboss.org/browse/JBWS-3189
+
+--------------------
jbossws-cxf-3.4.0.GA
--------------------
14 years
JBossWS SVN: r13509 - stack/cxf/branches/jbossws-cxf-3.4.1/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:20:47 -0500 (Thu, 16 Dec 2010)
New Revision: 13509
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/src/main/distro/ReleaseNotes.txt
Log:
updating release notes
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/src/main/distro/ReleaseNotes.txt 2010-12-16 11:14:45 UTC (rev 13508)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/src/main/distro/ReleaseNotes.txt 2010-12-16 11:20:47 UTC (rev 13509)
@@ -26,21 +26,22 @@
What's new in jbossws-cxf-${project.version}
----------------------------------
-Bug
-
- TODO: enumerate
-
Feature Request
- TODO: enumerate
+ * [JBWS-3139] - Ensure IPv6 Compatibility
+ * [JBWS-3161] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation
+ * [JBWS-3181] - Add support for symlinked bin/*.sh files
Task
- TODO: enumerate
+ * [JBWS-2896] - Fix unguarded calls to Logger.debug()
+ * [JBWS-3171] - Fix WebServiceContext injection into EJB3 beans
+ * [JBWS-3177] - Provide CDI Integration Points
+ * [JBWS-3179] - InvocationHandlerJAXWS is responsible for endpoint injections & lifecycle
Errata
- See: TODO: reference to associated JIRA issue
+ See: https://issues.jboss.org/browse/JBWS-3189
This version of ${project.name} is based on Apache CXF ${cxf.version}
14 years
JBossWS SVN: r13508 - stack/native/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:14:45 -0500 (Thu, 16 Dec 2010)
New Revision: 13508
Modified:
stack/native/trunk/src/main/distro/ReleaseNotes.txt
Log:
updateing release notes
Modified: stack/native/trunk/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/trunk/src/main/distro/ReleaseNotes.txt 2010-12-16 11:13:06 UTC (rev 13507)
+++ stack/native/trunk/src/main/distro/ReleaseNotes.txt 2010-12-16 11:14:45 UTC (rev 13508)
@@ -49,6 +49,30 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------------
+jbossws-native-3.4.1.GA
+-----------------------
+
+Feature Request
+
+ * [JBWS-3139] - Ensure IPv6 Compatibility
+ * [JBWS-3161] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation
+ * [JBWS-3181] - Add support for symlinked bin/*.sh files
+
+Bug
+
+ * [JBWS-3184] - Fix Native concurrency issue with endpoint instantiation
+
+Task
+
+ * [JBWS-2896] - Fix unguarded calls to Logger.debug()
+ * [JBWS-3171] - Fix WebServiceContext injection into EJB3 beans
+ * [JBWS-3177] - Provide CDI Integration Points
+
+Errata
+
+ See: https://issues.jboss.org/browse/JBWS-3188
+
+-----------------------
jbossws-native-3.4.0.GA
-----------------------
14 years
JBossWS SVN: r13507 - stack/native/branches/jbossws-native-3.4.1/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 06:13:06 -0500 (Thu, 16 Dec 2010)
New Revision: 13507
Modified:
stack/native/branches/jbossws-native-3.4.1/src/main/distro/ReleaseNotes.txt
Log:
updating release notes
Modified: stack/native/branches/jbossws-native-3.4.1/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/src/main/distro/ReleaseNotes.txt 2010-12-16 10:53:35 UTC (rev 13506)
+++ stack/native/branches/jbossws-native-3.4.1/src/main/distro/ReleaseNotes.txt 2010-12-16 11:13:06 UTC (rev 13507)
@@ -28,20 +28,24 @@
Feature Request
- TODO: enumerate
+ * [JBWS-3139] - Ensure IPv6 Compatibility
+ * [JBWS-3161] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation
+ * [JBWS-3181] - Add support for symlinked bin/*.sh files
Bug
- TODO: enumerate
+ * [JBWS-3184] - Fix Native concurrency issue with endpoint instantiation
Task
- TODO: enumerate
+ * [JBWS-2896] - Fix unguarded calls to Logger.debug()
+ * [JBWS-3171] - Fix WebServiceContext injection into EJB3 beans
+ * [JBWS-3177] - Provide CDI Integration Points
Errata
- See: TODO: reference to associated JIRA issue
-
+ See: https://issues.jboss.org/browse/JBWS-3188
+
Enjoy,
The JBossWS Team
14 years
JBossWS SVN: r13506 - in stack/native/branches/jbossws-native-3.4.1: modules/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-16 05:53:35 -0500 (Thu, 16 Dec 2010)
New Revision: 13506
Modified:
stack/native/branches/jbossws-native-3.4.1/modules/client/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/core/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/management/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/services/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.4.1/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.4.1/pom.xml
Log:
prepare for JBossWS Native 3.4.1.GA tagging
Modified: stack/native/branches/jbossws-native-3.4.1/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/client/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/client/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/core/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/core/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/endorsed/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/endorsed/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/management/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/management/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/resources/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/resources/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/services/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/services/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/services/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/testsuite/native-tests/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/testsuite/native-tests/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/modules/testsuite/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/modules/testsuite/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.1/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.1/pom.xml 2010-12-16 10:09:36 UTC (rev 13505)
+++ stack/native/branches/jbossws-native-3.4.1/pom.xml 2010-12-16 10:53:35 UTC (rev 13506)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>3.4.1-SNAPSHOT</version>
+ <version>3.4.1.GA</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
@@ -46,11 +46,11 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version>
- <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.spi.version>1.4.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.4.1.GA</jbossws.common.version>
+ <jbossws.framework.version>3.4.1.GA</jbossws.framework.version>
+ <jbossws.jboss501.version>3.4.0.GA</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.4.0.GA</jbossws.jboss510.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
14 years