JBossWS SVN: r18166 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2013-12-10 16:43:53 -0500 (Tue, 10 Dec 2013)
New Revision: 18166
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
Log:
BZ-1029762: Made error msg number unique
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:40:36 UTC (rev 18165)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:43:53 UTC (rev 18166)
@@ -222,7 +222,7 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
- @Message(id = 24097, value = "Could not find endpoint config name: %s")
+ @Message(id = 24101, value = "Could not find endpoint config name: %s")
WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
10 years, 4 months
JBossWS SVN: r18165 - stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2013-12-10 16:40:36 -0500 (Tue, 10 Dec 2013)
New Revision: 18165
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
Log:
BZ-1029762: Made error msg number unique
Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:25:10 UTC (rev 18164)
+++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:40:36 UTC (rev 18165)
@@ -222,7 +222,7 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
- @Message(id = 24097, value = "Could not find endpoint config name: %s")
+ @Message(id = 24101, value = "Could not find endpoint config name: %s")
WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
10 years, 4 months
JBossWS SVN: r18164 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2013-12-10 16:25:10 -0500 (Tue, 10 Dec 2013)
New Revision: 18164
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
BZ-1029762: added check that endpointConfig is set else throw exception.
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:24:30 UTC (rev 18163)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:25:10 UTC (rev 18164)
@@ -35,6 +35,7 @@
import org.jboss.logging.MessageBundle;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
* JBossWS-CXF exception messages
@@ -220,5 +221,8 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
+
+ @Message(id = 24097, value = "Could not find endpoint config name: %s")
+ WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10 21:24:30 UTC (rev 18163)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10 21:25:10 UTC (rev 18164)
@@ -135,14 +135,20 @@
{
//use endpoint configs from AS domain
ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
+ boolean isSetEndpointConfig = false;
for (org.jboss.wsf.spi.metadata.config.EndpointConfig config : sc.getEndpointConfigs())
{
if (config.getConfigName().equals(configName))
{
endpoint.setEndpointConfig(config);
+ isSetEndpointConfig = true;
break;
}
}
+
+ if (!isSetEndpointConfig){
+ throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName);
+ }
}
else
{
10 years, 4 months
JBossWS SVN: r18163 - in stack/cxf/branches/jbossws-cxf-4.2.x/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2013-12-10 16:24:30 -0500 (Tue, 10 Dec 2013)
New Revision: 18163
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
BZ-1029762: added check that endpointConfig is set else throw exception.
Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 16:52:54 UTC (rev 18162)
+++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10 21:24:30 UTC (rev 18163)
@@ -35,6 +35,7 @@
import org.jboss.logging.MessageBundle;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
* JBossWS-CXF exception messages
@@ -220,5 +221,8 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
+
+ @Message(id = 24097, value = "Could not find endpoint config name: %s")
+ WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10 16:52:54 UTC (rev 18162)
+++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10 21:24:30 UTC (rev 18163)
@@ -135,14 +135,20 @@
{
//use endpoint configs from AS domain
ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
+ boolean isSetEndpointConfig = false;
for (org.jboss.wsf.spi.metadata.config.EndpointConfig config : sc.getEndpointConfigs())
{
if (config.getConfigName().equals(configName))
{
endpoint.setEndpointConfig(config);
+ isSetEndpointConfig = true;
break;
}
}
+
+ if (!isSetEndpointConfig){
+ throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName);
+ }
}
else
{
10 years, 4 months
JBossWS SVN: r18162 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-10 11:52:54 -0500 (Tue, 10 Dec 2013)
New Revision: 18162
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Use latest framework
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-10 16:52:29 UTC (rev 18161)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-10 16:52:54 UTC (rev 18162)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP13</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP8</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
10 years, 4 months
JBossWS SVN: r18161 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1702.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-10 11:52:29 -0500 (Tue, 10 Dec 2013)
New Revision: 18161
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java
Log:
[JBAPP-10922] Use @WebMethod(action="...") for stable results
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2013-12-10 16:51:24 UTC (rev 18160)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2013-12-10 16:52:29 UTC (rev 18161)
@@ -39,7 +39,9 @@
)
public interface SampleWSBareSEI
{
+ @WebMethod(action="getClassCAsClassB")
ResponseWrapperB getClassCAsClassB();
+ @WebMethod(action="getClassC")
ResponseWrapperC getClassC();
}
10 years, 4 months
JBossWS SVN: r18160 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-10 11:51:24 -0500 (Tue, 10 Dec 2013)
New Revision: 18160
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
Log:
[JBPAPP-10922] Also consider SOAPAction header for operation selection
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2013-12-10 16:50:16 UTC (rev 18159)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2013-12-10 16:51:24 UTC (rev 18160)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -24,6 +24,7 @@
import java.util.Iterator;
import javax.xml.namespace.QName;
+import javax.xml.soap.MimeHeaders;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
@@ -100,16 +101,41 @@
if (epMetaData.getStyle() == Style.RPC)
throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
- // [JBWS-1125] Support empty soap body elements
- for (OperationMetaData opAux : epMetaData.getOperations())
- {
- if (opAux.getParameters().size() == 0)
+
+ String soapAction = null;
+ final MimeHeaders mh = soapMessage.getMimeHeaders();
+ if (mh != null) {
+ final String[] array = mh.getHeader("SOAPAction");
+ if (array != null && array.length > 0) {
+ soapAction = array[0];
+ if (soapAction != null && soapAction.startsWith("\"") && soapAction.endsWith("\"")) {
+ soapAction = soapAction.substring(1, soapAction.length() - 1);
+ }
+ }
+ }
+
+ if (soapAction != null && soapAction.length() > 0) {
+ for (OperationMetaData opAux : epMetaData.getOperations())
{
- log.debug ("Dispatching empty SOAP body");
- opMetaData = opAux;
- break;
+ if (soapAction.equals(opAux.getSOAPAction())) {
+ opMetaData = opAux;
+ break;
+ }
}
}
+
+ if (opMetaData == null) {
+ // [JBWS-1125] Support empty soap body elements
+ for (OperationMetaData opAux : epMetaData.getOperations())
+ {
+ if (opAux.getParameters().size() == 0)
+ {
+ log.debug ("Dispatching empty SOAP body");
+ opMetaData = opAux;
+ break;
+ }
+ }
+ }
}
else
{
10 years, 4 months
JBossWS SVN: r18159 - in framework/branches/jbossws-framework-3.1.2/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-10 11:50:16 -0500 (Tue, 10 Dec 2013)
New Revision: 18159
Added:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWS.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWSSEI.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/web.xml
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBPAPP-10922] Adding testcase
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2013-12-09 18:51:05 UTC (rev 18158)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2013-12-10 16:50:16 UTC (rev 18159)
@@ -852,6 +852,14 @@
</webinf>
</war>
+ <!-- jaxws-operationDispatch -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-operationDispatch.war" webxml="${tests.output.dir}/test-resources/jaxws/operationDispatch/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/operationDispatch/**/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/operationDispatch/WEB-INF"/>
+ </war>
+
<!-- jaxws-webfault -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webfault.war" webxml="${tests.output.dir}/test-resources/jaxws/webfault/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java 2013-12-10 16:50:16 UTC (rev 18159)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.operationDispatch;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Verifies proper operation dispatching based on SOAPAction header
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class SOAPActionDispatchTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SOAPActionDispatchTestCase.class, "jaxws-operationDispatch.war");
+ }
+
+ private final String msgString =
+ "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <soap:Body>" +
+ " </soap:Body>" +
+ "</soap:Envelope>";
+
+ public void testJAXWSServiceInvocation() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-operationDispatch/SampleWS?wsdl");
+ QName serviceName = new QName("http://operationDispatch.jaxws.ws.test.jboss.org/", "SampleWSService");
+ Service service = Service.create(wsdlURL, serviceName);
+
+ SampleWSSEI port = service.getPort(SampleWSSEI.class);
+ assertEquals("foo", port.foo());
+ assertEquals("bar", port.bar());
+ }
+
+ public void testJAXWSDispatchInvocation() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-operationDispatch/SampleWS?wsdl");
+ QName serviceName = new QName("http://operationDispatch.jaxws.ws.test.jboss.org/", "SampleWSService");
+ QName portName = new QName("http://operationDispatch.jaxws.ws.test.jboss.org/", "SampleWSPort");
+
+ Service service = Service.create(serviceName);
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm());
+
+ Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
+
+ sendMessage(dispatch, "opFoo", "fooResponse");
+ sendMessage(dispatch, "opBar", "barResponse");
+
+ }
+
+ private void sendMessage(final Dispatch<SOAPMessage> dispatch, final String soapAction, final String responseElementName) throws SOAPException, IOException {
+ SOAPMessage reqMsg = getRequestMessage();
+ reqMsg.getMimeHeaders().addHeader("SOAPAction", soapAction);
+ SOAPMessage resMsg = dispatch.invoke(reqMsg);
+ SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
+
+ SOAPHeader soapHeader = resEnv.getHeader();
+ if (soapHeader != null)
+ soapHeader.detachNode();
+ Element body = resEnv.getBody();
+ Node child = body.getFirstChild();
+ assertEquals(responseElementName, child.getLocalName());
+ }
+
+ private SOAPMessage getRequestMessage() throws SOAPException, IOException
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes()));
+ return reqMsg;
+ }
+
+}
Property changes on: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SOAPActionDispatchTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWS.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWS.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWS.java 2013-12-10 16:50:16 UTC (rev 18159)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.operationDispatch;
+
+import javax.jws.WebService;
+
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.operationDispatch.SampleWSSEI")
+public class SampleWS implements SampleWSSEI
+{
+
+ public SampleWS()
+ {
+ }
+
+ public String foo()
+ {
+ return "foo";
+ }
+
+ public String bar()
+ {
+ return "bar";
+ }
+
+}
Property changes on: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWS.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWSSEI.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWSSEI.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWSSEI.java 2013-12-10 16:50:16 UTC (rev 18159)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.operationDispatch;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService
+@SOAPBinding(
+ style = SOAPBinding.Style.DOCUMENT,
+ use = SOAPBinding.Use.LITERAL,
+ parameterStyle = SOAPBinding.ParameterStyle.BARE
+)
+public interface SampleWSSEI
+{
+ @WebMethod(action="opFoo")
+ String foo();
+
+ @WebMethod(action="opBar")
+ String bar();
+}
Property changes on: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/operationDispatch/SampleWSSEI.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/web.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/web.xml (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/web.xml 2013-12-10 16:50:16 UTC (rev 18159)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>SampleWS</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.operationDispatch.SampleWS</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SampleWS</servlet-name>
+ <url-pattern>/SampleWS</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/operationDispatch/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 4 months
JBossWS SVN: r18158 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-09 13:51:05 -0500 (Mon, 09 Dec 2013)
New Revision: 18158
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
Log:
Fixing testsuite dependencies to make the testsuite run against current EAP 5.3 branch
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-09 18:45:05 UTC (rev 18157)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-09 18:51:05 UTC (rev 18158)
@@ -318,28 +318,90 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms-client</artifactId>
<version>${hornetq.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>5.0.3.GA_CP02</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>5.0.3.GA_CP02</version>
+ </dependency>
</dependencies>
<build>
<plugins>
10 years, 4 months
JBossWS SVN: r18157 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2013-12-09 13:45:05 -0500 (Mon, 09 Dec 2013)
New Revision: 18157
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
bz-1032593: added method to remove app's wsdl directory
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2013-12-09 18:43:51 UTC (rev 18156)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2013-12-09 18:45:05 UTC (rev 18157)
@@ -208,4 +208,20 @@
@LogMessage(level = WARN)
@Message(id = 24095, value = "Unknown strategy '%s' requested for selecting the Apache CXF Bus to be used for building JAXWS clients; default strategy will be used.")
void unknownJAXWSClientBusStrategy(String strategy);
+
+ @LogMessage(level = WARN)
+ @Message(id = 24097, value = "Could not delete wsdl file %s")
+ void couldNotDeleteWsdlFile(String filename);
+
+ @LogMessage(level = DEBUG)
+ @Message(id = 24098, value = "Deleted wsdl file %s")
+ void deletedWsdlFile(String filename);
+
+ @LogMessage(level = WARN)
+ @Message(id = 24099, value = "Could not create wsdl data path.")
+ void couldNotCreateWsdlDataPath();
+
+ @LogMessage(level = WARN)
+ @Message(id = 24100, value = "Could not delete wsdl directory %s")
+ void couldNotDeleteWsdlDirectory(String filename);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2013-12-09 18:43:51 UTC (rev 18156)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2013-12-09 18:45:05 UTC (rev 18157)
@@ -90,6 +90,8 @@
// Publish XMLSchema imports
publishSchemaImports(wsdlPublishURL, doc.getDocumentElement(), published, expLocation);
+
+ dep.addAttachment(WSDLFilePublisher.class, this);
}
else
{
@@ -105,7 +107,48 @@
throw Messages.MESSAGES.cannotPublishWSDLTo(serviceName, wsdlFile, e);
}
}
-
+
+ public void unpublishWsdlFiles()
+ {
+ String deploymentName = dep.getCanonicalName();
+
+ if (deploymentName.startsWith("http://"))
+ {
+ deploymentName = deploymentName.replace("http://", "http-");
+ }
+
+ try {
+
+ File publishDir = new File(serverConfig.getServerDataDir().getCanonicalPath()
+ + "/wsdl/" + deploymentName);
+ if (publishDir.exists())
+ {
+ File[] wsdlFileList = publishDir.listFiles();
+ if (wsdlFileList != null)
+ {
+ for (int i = 0; i < wsdlFileList.length; i++)
+ {
+ File f = wsdlFileList[i];
+ if (f.delete())
+ {
+ Loggers.DEPLOYMENT_LOGGER.deletedWsdlFile(f.getAbsolutePath());
+ } else {
+ Loggers.DEPLOYMENT_LOGGER.couldNotDeleteWsdlFile(f.getAbsolutePath());
+ }
+ }
+ }
+ }
+
+ if (!publishDir.delete())
+ {
+ Loggers.DEPLOYMENT_LOGGER.couldNotDeleteWsdlDirectory(publishDir.getAbsolutePath());
+ }
+
+ } catch (IOException e) {
+ Loggers.DEPLOYMENT_LOGGER.couldNotCreateWsdlDataPath();
+ }
+ }
+
private static Document getWsdlDocument(Bus bus, Definition def) throws WSDLException
{
WSDLWriter wsdlWriter = bus.getExtension(WSDLManager.class).getWSDLFactory().newWSDLWriter();
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-12-09 18:43:51 UTC (rev 18156)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2013-12-09 18:45:05 UTC (rev 18157)
@@ -74,6 +74,12 @@
if (holder != null)
{
holder.close();
+
+ WSDLFilePublisher wsdlFilePublisher = dep.getAttachment(WSDLFilePublisher.class);
+ if (wsdlFilePublisher != null)
+ {
+ wsdlFilePublisher.unpublishWsdlFiles();
+ }
}
}
10 years, 4 months