JBossWS SVN: r17766 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-11 06:01:21 -0400 (Thu, 11 Jul 2013)
New Revision: 17766
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultLifecycleHandler.java
Log:
[JBWS-3660]:Simply return if the Endpoint is already stopped
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultLifecycleHandler.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultLifecycleHandler.java 2013-07-10 17:15:46 UTC (rev 17765)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultLifecycleHandler.java 2013-07-11 10:01:21 UTC (rev 17766)
@@ -71,6 +71,10 @@
public void stop(Endpoint ep)
{
EndpointState state = ep.getState();
+ if (state == EndpointState.STOPPED) {
+ //if the endpoint is stopped in EndpointServiceDA
+ return;
+ }
if (state != EndpointState.STARTED)
{
Loggers.DEPLOYMENT_LOGGER.cannotStopEndpoint(state, ep.getName());
10 years, 9 months
- 1
- 0
JBossWS SVN: r17765 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-10 13:15:46 -0400 (Wed, 10 Jul 2013)
New Revision: 17765
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Enhancing ServletCtxTestCase and excluding it on AS 7.x due to CXF-5116. The bug does not affect WFLY 8 / Undertow.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java 2013-07-09 12:13:32 UTC (rev 17764)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java 2013-07-10 17:15:46 UTC (rev 17765)
@@ -67,6 +67,12 @@
assertEquals("Hello", retObj);
assertEquals(1, portOne.getCount1() - count1);
assertEquals(1, portOne.getCount2() - count2);
+ count1 = portOne.getCount1();
+ count2 = portOne.getCount2();
+ portOne.echoOneWay("Hi");
+ Thread.sleep(3000);
+ assertEquals(1, portOne.getCount1() - count1);
+ assertEquals(1, portOne.getCount2() - count2);
}
public void testConcurrentInvocations() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-09 12:13:32 UTC (rev 17764)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-10 17:15:46 UTC (rev 17765)
@@ -660,6 +660,9 @@
<!--# [JBWS-3560] fastinfoset module is required in as712 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
+ <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
+
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
@@ -727,6 +730,9 @@
<!--# [JBWS-3560] fastinfoset module is required in as713 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
+ <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
+
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
@@ -791,6 +797,9 @@
<!--# [JBWS-3560] fastinfoset module is required in as720 -->
<exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
+ <!--# [CXF-5116] DelegatingInputStream created in AbstractHTTPDestination is cached into wrong Message instance -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase*</exclude>
+
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
</excludes>
10 years, 9 months
- 1
- 0
JBossWS SVN: r17764 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-09 08:13:32 -0400 (Tue, 09 Jul 2013)
New Revision: 17764
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
Adding test on http servlet context retrieval
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-07-05 12:48:02 UTC (rev 17763)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-07-09 12:13:32 UTC (rev 17764)
@@ -481,6 +481,17 @@
</manifest>
</war>
+ <!-- jaxws-cxf-servletCtx -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-servletCtx.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOneImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOne.class"/>
+ </classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
+ </war>
+
<!-- jaxws-cxf-spring -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-spring.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOne.java 2013-07-09 12:13:32 UTC (rev 17764)
@@ -0,0 +1,38 @@
+/*
+ * 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.cxf.servletCtx;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/servletCtx", serviceName = "ServiceOne")
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount1();
+
+ int getCount2();
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/EndpointOneImpl.java 2013-07-09 12:13:32 UTC (rev 17764)
@@ -0,0 +1,85 @@
+/*
+ * 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.cxf.servletCtx;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.annotation.Resource;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.soap.Addressing;
+
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/servletCtx", serviceName = "ServiceOne")
+@Addressing
+public class EndpointOneImpl implements EndpointOne
+{
+ private static AtomicInteger count1 = new AtomicInteger(0);
+ private static AtomicInteger count2 = new AtomicInteger(0);
+ @Resource
+ private WebServiceContext context;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ count1.incrementAndGet();
+ MessageContext msgContext = context.getMessageContext();
+ HttpServletRequest request = (HttpServletRequest)msgContext.get(MessageContext.SERVLET_REQUEST);
+ final String scheme = request.getScheme();
+ Logger.getLogger(this.getClass()).info("echo: " + input + ", scheme: " + scheme);
+ if (scheme != null) {
+ count2.incrementAndGet();
+ }
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ count1.incrementAndGet();
+ MessageContext msgContext = context.getMessageContext();
+ HttpServletRequest request = (HttpServletRequest)msgContext.get(MessageContext.SERVLET_REQUEST);
+ final String scheme = request.getScheme();
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input + ", scheme: " + scheme);
+ if (scheme != null) {
+ count2.incrementAndGet();
+ }
+ }
+
+ @WebMethod
+ public int getCount1()
+ {
+ return count1.get();
+ }
+
+ @WebMethod
+ public int getCount2()
+ {
+ return count2.get();
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/servletCtx/ServletCtxTestCase.java 2013-07-09 12:13:32 UTC (rev 17764)
@@ -0,0 +1,146 @@
+/*
+ * 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.cxf.servletCtx;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 09-Jul-2013
+ */
+public class ServletCtxTestCase extends JBossWSTest
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-servletCtx/ServiceOne";
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ServletCtxTestCase.class, "jaxws-cxf-servletCtx.war");
+ }
+
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/servletCtx";
+
+ private EndpointOne portOne;
+
+ protected int defaultSize = 30;
+
+ public void testAccess() throws Exception
+ {
+ initPort();
+ int count1 = portOne.getCount1();
+ int count2 = portOne.getCount2();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ assertEquals(1, portOne.getCount1() - count1);
+ assertEquals(1, portOne.getCount2() - count2);
+ }
+
+ public void testConcurrentInvocations() throws Exception
+ {
+ runConcurrentTests(false);
+ }
+
+ public void testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPort();
+ final int size = defaultSize;
+ int count1 = portOne.getCount1();
+ int count2 = portOne.getCount2();
+ ExecutorService es = Executors.newFixedThreadPool(size);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size);
+ for (int i = 0; i < size; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway, i));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ if (oneway)
+ {
+ Thread.sleep(3000);
+ }
+ assertEquals(size, portOne.getCount1() - count1);
+ assertEquals(size, portOne.getCount2() - count2);
+ }
+
+ private void initPort() throws MalformedURLException
+ {
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ portOne = (EndpointOne) serviceOne.getPort(EndpointOne.class);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+
+ private boolean oneway;
+
+ private int seqNum;
+
+ public CallableOne(EndpointOne port, boolean oneway, int seqNum)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ this.seqNum = seqNum;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo" + seqNum;
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+}
10 years, 9 months
- 1
- 0
JBossWS SVN: r17763 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src: main/java/org/jboss/ws/extensions/security/element and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-05 08:48:02 -0400 (Fri, 05 Jul 2013)
New Revision: 17763
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/DecryptionOperation.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/FailedCheckException.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityException.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
Log:
[JBPAPP-10807] Merged CVE-2011-2487 from JBPAPP-10421
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/DecryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/DecryptionOperation.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/DecryptionOperation.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -116,7 +116,7 @@
}
catch (XMLEncryptionException e)
{
- throw new FailedCheckException("Decryption was invalid.");
+ throw new FailedCheckException(e);
}
catch (Exception e)
{
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -23,6 +23,7 @@
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
+import java.util.HashMap;
import java.util.List;
import javax.crypto.KeyGenerator;
@@ -46,6 +47,43 @@
private SecurityHeader header;
private SecurityStore store;
+
+ private static class Algorithm
+ {
+ Algorithm(String jceName, String xmlName, int size)
+ {
+ this.jceName = jceName;
+ this.xmlName = xmlName;
+ this.size = size;
+ }
+
+ public String jceName;
+ public String xmlName;
+ public int size;
+ }
+
+ private static HashMap<String, Algorithm> algorithms;
+ private static HashMap<String, String> algorithmsID;
+
+ private static final String DEFAULT_ALGORITHM = "aes-128";
+
+ static
+ {
+ algorithms = new HashMap<String, Algorithm>(4);
+ algorithms.put("aes-128", new Algorithm("AES", XMLCipher.AES_128, 128));
+ algorithms.put("aes-192", new Algorithm("AES", XMLCipher.AES_192, 192));
+ algorithms.put("aes-256", new Algorithm("AES", XMLCipher.AES_256, 256));
+ algorithms.put("aes-128-gcm", new Algorithm("AES", XMLCipher.AES_128_GCM, 128));
+ algorithms.put("aes-192-gcm", new Algorithm("AES", XMLCipher.AES_192_GCM, 192));
+ algorithms.put("aes-256-gcm", new Algorithm("AES", XMLCipher.AES_256_GCM, 256));
+ algorithms.put("tripledes", new Algorithm("TripleDes", XMLCipher.TRIPLEDES, 168));
+
+ algorithmsID = new HashMap<String, String>(4);
+ algorithmsID.put(XMLCipher.AES_128, "aes-128");
+ algorithmsID.put(XMLCipher.AES_192, "aes-192");
+ algorithmsID.put(XMLCipher.AES_256, "aes-256");
+ algorithmsID.put(XMLCipher.TRIPLEDES, "tripledes");
+ }
public EncryptionOperation(SecurityHeader header, SecurityStore store) throws WSSecurityException
{
@@ -89,6 +127,7 @@
public static SecretKey getSecretKey(String algorithm) throws WSSecurityException
{
+ Algorithm alg = algorithms.get(algorithm);
try
{
KeyGenerator kgen = KeyGenerator.getInstance(EncryptionAlgorithms.getAlgorithmJceName(algorithm));
@@ -103,8 +142,8 @@
public void process(Document message, List<Target> targets, String alias, String credential, String algorithm, boolean digest, boolean useNonce, boolean useTimestamp) throws WSSecurityException
{
- if (! EncryptionAlgorithms.hasAlgorithm(algorithm)) {
- algorithm = EncryptionAlgorithms.DEFAULT_ALGORITHM;
+ if (! algorithms.containsKey(algorithm)) {
+ algorithm = DEFAULT_ALGORITHM;
}
SecretKey secretKey = getSecretKey(algorithm);
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/FailedCheckException.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/FailedCheckException.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/FailedCheckException.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -32,7 +32,7 @@
{
public static final QName faultCode = new QName(Constants.WSSE_NS, "FailedCheck", Constants.WSSE_PREFIX);
- public static final String faultString = "The signature or decryption was invlaid.";
+ public static final String faultString = "The signature or decryption was invalid.";
public FailedCheckException()
{
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -69,6 +69,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(WSSecurityDispatcher.class);
+
+ private static boolean VERBOSE_EXCEPTION_REPORTING = Boolean.getBoolean("org.jboss.ws.native.security.verbose_exception_reporting");
private static List<Target> convertTargets(List<org.jboss.ws.metadata.wsse.Target> targets)
{
@@ -112,8 +114,18 @@
private static CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ return convertToFault(e, VERBOSE_EXCEPTION_REPORTING);
}
+
+ private static CommonSOAPFaultException convertToFault(WSSecurityException e, boolean verbose)
+ {
+ if (verbose) {
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
+ } else {
+ QName faultCode = new QName(Constants.JBOSS_WSSE_NS, "GenericError", Constants.JBOSS_WSSE_PREFIX);
+ return new CommonSOAPFaultException(faultCode, "A WS-Security error occurred.");
+ }
+ }
public static void handleInbound(CommonMessageContext ctx) throws SOAPException, SOAPFaultException
{
@@ -152,7 +164,7 @@
if (hasRequirements(config, operation, port))
- throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."));
+ throw convertToFault(new InvalidSecurityHeaderException("This service requires <wsse:Security>, which is missing."), true);
}
try
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityException.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityException.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/WSSecurityException.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -71,4 +71,9 @@
{
return faultString;
}
+
+ public void setInternal(boolean internal)
+ {
+ this.internal = internal;
+ }
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/main/java/org/jboss/ws/extensions/security/element/EncryptedKey.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -36,6 +36,8 @@
import org.jboss.ws.extensions.security.KeyResolver;
import org.jboss.ws.extensions.security.Util;
import org.jboss.ws.extensions.security.WSSecurityException;
+import org.jboss.ws.extensions.security.EncryptionOperation;
+import org.jboss.ws.extensions.security.FailedCheckException;
import org.jboss.ws.extensions.security.operation.EncryptionAlgorithms;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -155,7 +157,16 @@
}
catch (XMLSecurityException e)
{
- throw new WSSecurityException("Could not parse encrypted key: " + e.getMessage(), e);
+ try
+ {
+ this.secretKey = EncryptionOperation.generateSecretKey(alg);
+ }
+ catch (Exception ex)
+ {
+ WSSecurityException exception = new FailedCheckException(e);
+ exception.setInternal(true);
+ throw exception;
+ }
}
this.document = element.getOwnerDocument();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-07-05 11:31:41 UTC (rev 17762)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2013-07-05 12:48:02 UTC (rev 17763)
@@ -50,7 +50,7 @@
private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1999";
- private static final String FAULT_CODE = "wsse:FailedAuthentication";
+ private static final String FAULT_CODE = "jboss-wsse:GenericError";
private static final String FAULT_STRING = "The security token could not be authenticated or authorized.";
@@ -111,8 +111,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault String", FAULT_STRING, faultString);
}
}
@@ -149,8 +147,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
@@ -173,8 +169,6 @@
SOAPFault fault = sfe.getFault();
String faultCode = fault.getFaultCode();
assertEquals("Fault Code", FAULT_CODE, faultCode);
- String faultString = fault.getFaultString();
- assertEquals("Fault Message", FAULT_STRING, faultString);
}
}
10 years, 9 months
- 1
- 0
JBossWS SVN: r17762 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-05 07:31:41 -0400 (Fri, 05 Jul 2013)
New Revision: 17762
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP11_JBPAPP-10807/
Log:
[JBPAPP-10807] Copy branch from JBPAPP-10768 so previous CVE's are included
10 years, 9 months
- 1
- 0
JBossWS SVN: r17761 - in thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779: tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-03 07:09:36 -0400 (Wed, 03 Jul 2013)
New Revision: 17761
Added:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/Hello.java
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/HelloImpl.java
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHi.java
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHiResponse.java
Modified:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Log:
[BZ-980779] Backported CXF-4877
Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java 2013-07-03 08:58:50 UTC (rev 17760)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -99,7 +99,6 @@
public class ServiceWSDLBuilder {
private final Map<String, String> ns2prefix;
- private Definition definition;
private final List<ServiceInfo> services;
private boolean useSchemaImports;
private String baseFileName;
@@ -168,6 +167,7 @@
* @throws WSDLException
*/
public Definition build(Map<String, SchemaInfo> imports) throws WSDLException {
+ Definition definition = null;
try {
definition = services.get(0).getProperty(WSDLServiceBuilder.WSDL_DEFINITION, Definition.class);
} catch (ClassCastException e) {
@@ -177,11 +177,12 @@
ServiceInfo si = services.get(0);
definition = newDefinition(si.getName(), si.getTargetNamespace());
addNamespace(WSDLConstants.CONVENTIONAL_TNS_PREFIX, si.getTargetNamespace(), definition);
- addExtensibilityElements(definition, getWSDL11Extensors(si.getDescription()));
+ addExtensibilityElements(definition, definition, getWSDL11Extensors(si.getDescription()));
Collection<PortType> portTypes = new HashSet<PortType>();
for (ServiceInfo service : services) {
Definition portTypeDef = definition;
+ Definition orig = definition;
if (!isSameTNS(service)) {
portTypeDef = newDefinition(service.getInterface().getName(),
service.getInterface().getName().getNamespaceURI());
@@ -192,6 +193,7 @@
wsdlImport.setLocationURI(service.getInterface().getName().getLocalPart() + ".wsdl");
definition.addImport(wsdlImport);
addNamespace(getPrefix(tns), tns, definition);
+ definition = portTypeDef;
}
portTypes.add(buildPortType(service.getInterface(), portTypeDef));
@@ -203,11 +205,12 @@
imports, portTypeDef);
}
}
+ definition = orig;
}
for (ServiceInfo service : services) {
- buildBinding(service.getBindings(), portTypes);
- buildService(service);
+ buildBinding(definition, service.getBindings(), portTypes);
+ buildService(service, definition);
}
}
return definition;
@@ -254,30 +257,32 @@
el.setTextContent(text);
wsdlel.setDocumentationElement(el);
}
- protected void addExtensibilityElements(ElementExtensible elementExtensible,
- List<ExtensibilityElement> extensibilityElements) {
+ protected void addExtensibilityElements(Definition def,
+ ElementExtensible elementExtensible,
+ List<ExtensibilityElement> extensibilityElements) {
if (extensibilityElements != null) {
for (ExtensibilityElement element : extensibilityElements) {
if (element instanceof UnknownExtensibilityElement) {
UnknownExtensibilityElement uee = (UnknownExtensibilityElement)element;
String pfx = uee.getElement().getPrefix();
- addNamespace(pfx, element.getElementType().getNamespaceURI());
+ addNamespace(pfx, element.getElementType().getNamespaceURI(), def);
} else {
QName qn = element.getElementType();
- addNamespace(qn.getNamespaceURI());
+ addNamespace(qn.getNamespaceURI(), def);
}
elementExtensible.addExtensibilityElement(element);
}
}
}
- private void addExtensibilityAttributes(AttributeExtensible attributeExtensible,
+ private void addExtensibilityAttributes(Definition def,
+ AttributeExtensible attributeExtensible,
Map<QName, Object> attributes) {
if (attributes == null) {
return;
}
for (QName qname : attributes.keySet()) {
- addNamespace(qname.getNamespaceURI());
+ addNamespace(qname.getNamespaceURI(), def);
attributeExtensible.setExtensionAttribute(qname, attributes.get(qname));
}
}
@@ -469,7 +474,9 @@
schema.addImport(imp);
}
- protected void buildBinding(Collection<BindingInfo> bindingInfos, Collection<PortType> portTypes) {
+ protected void buildBinding(Definition definition,
+ Collection<BindingInfo> bindingInfos,
+ Collection<PortType> portTypes) {
Binding binding = null;
for (BindingInfo bindingInfo : bindingInfos) {
binding = definition.createBinding();
@@ -483,10 +490,10 @@
}
binding.setQName(bindingInfo.getName());
if (!bindingInfo.getName().getNamespaceURI().equals(definition.getTargetNamespace())) {
- addNamespace(bindingInfo.getName().getNamespaceURI());
+ addNamespace(bindingInfo.getName().getNamespaceURI(), definition);
}
buildBindingOperation(definition, binding, bindingInfo.getOperations());
- addExtensibilityElements(binding, getWSDL11Extensors(bindingInfo));
+ addExtensibilityElements(definition, binding, getWSDL11Extensors(bindingInfo));
definition.addBinding(binding);
}
}
@@ -508,8 +515,8 @@
buildBindingInput(def, bindingOperation, bindingOperationInfo.getInput());
buildBindingOutput(def, bindingOperation, bindingOperationInfo.getOutput());
buildBindingFault(def, bindingOperation, bindingOperationInfo.getFaults());
- addExtensibilityAttributes(bindingOperation, bindingOperationInfo.getExtensionAttributes());
- addExtensibilityElements(bindingOperation, getWSDL11Extensors(bindingOperationInfo));
+ addExtensibilityAttributes(def, bindingOperation, bindingOperationInfo.getExtensionAttributes());
+ addExtensibilityElements(def, bindingOperation, getWSDL11Extensors(bindingOperationInfo));
binding.addBindingOperation(bindingOperation);
}
}
@@ -523,8 +530,8 @@
addDocumentation(bindingFault, bindingFaultInfo.getDocumentation());
bindingFault.setName(bindingFaultInfo.getFaultInfo().getFaultName().getLocalPart());
bindingOperation.addBindingFault(bindingFault);
- addExtensibilityAttributes(bindingFault, bindingFaultInfo.getExtensionAttributes());
- addExtensibilityElements(bindingFault, getWSDL11Extensors(bindingFaultInfo));
+ addExtensibilityAttributes(def, bindingFault, bindingFaultInfo.getExtensionAttributes());
+ addExtensibilityElements(def, bindingFault, getWSDL11Extensors(bindingFaultInfo));
}
}
@@ -537,8 +544,8 @@
addDocumentation(bindingInput, bindingMessageInfo.getDocumentation());
bindingInput.setName(bindingMessageInfo.getMessageInfo().getName().getLocalPart());
bindingOperation.setBindingInput(bindingInput);
- addExtensibilityAttributes(bindingInput, bindingMessageInfo.getExtensionAttributes());
- addExtensibilityElements(bindingInput, getWSDL11Extensors(bindingMessageInfo));
+ addExtensibilityAttributes(def, bindingInput, bindingMessageInfo.getExtensionAttributes());
+ addExtensibilityElements(def, bindingInput, getWSDL11Extensors(bindingMessageInfo));
}
}
@@ -550,12 +557,12 @@
addDocumentation(bindingOutput, bindingMessageInfo.getDocumentation());
bindingOutput.setName(bindingMessageInfo.getMessageInfo().getName().getLocalPart());
bindingOperation.setBindingOutput(bindingOutput);
- addExtensibilityAttributes(bindingOutput, bindingMessageInfo.getExtensionAttributes());
- addExtensibilityElements(bindingOutput, getWSDL11Extensors(bindingMessageInfo));
+ addExtensibilityAttributes(def, bindingOutput, bindingMessageInfo.getExtensionAttributes());
+ addExtensibilityElements(def, bindingOutput, getWSDL11Extensors(bindingMessageInfo));
}
}
- protected void buildService(ServiceInfo serviceInfo) {
+ protected void buildService(ServiceInfo serviceInfo, Definition definition) {
Map<QName, MessageInfo> messages = serviceInfo.getMessages();
for (Map.Entry<QName, MessageInfo> mie : messages.entrySet()) {
@@ -594,17 +601,17 @@
Service serv = definition.createService();
addDocumentation(serv, serviceInfo.getDocumentation());
serv.setQName(serviceInfo.getName());
- addNamespace(serviceInfo.getName().getNamespaceURI());
- addExtensibilityElements(serv, getWSDL11Extensors(serviceInfo));
+ addNamespace(serviceInfo.getName().getNamespaceURI(), definition);
+ addExtensibilityElements(definition, serv, getWSDL11Extensors(serviceInfo));
definition.addService(serv);
for (EndpointInfo ei : serviceInfo.getEndpoints()) {
- addNamespace(ei.getTransportId());
+ addNamespace(ei.getTransportId(), definition);
Port port = definition.createPort();
addDocumentation(port, ei.getDocumentation());
port.setName(ei.getName().getLocalPart());
port.setBinding(definition.getBinding(ei.getBinding().getName()));
- addExtensibilityElements(port, getWSDL11Extensors(ei));
+ addExtensibilityElements(definition, port, getWSDL11Extensors(ei));
serv.addPort(port);
}
}
@@ -622,8 +629,8 @@
portType.setQName(intf.getName());
addDocumentation(portType, intf.getDocumentation());
addNamespace(intf.getName().getNamespaceURI(), def);
- addExtensibilityElements(portType, getWSDL11Extensors(intf));
- addExtensibilityAttributes(portType, intf.getExtensionAttributes());
+ addExtensibilityElements(def, portType, getWSDL11Extensors(intf));
+ addExtensibilityAttributes(def, portType, intf.getExtensionAttributes());
portType.setUndefined(false);
buildPortTypeOperation(portType, intf.getOperations(), def);
}
@@ -636,14 +643,6 @@
addNamespace(getPrefix(namespaceURI), namespaceURI, def);
}
- protected void addNamespace(String namespaceURI) {
- addNamespace(getPrefix(namespaceURI), namespaceURI);
- }
-
- protected void addNamespace(String prefix, String namespaceURI) {
- addNamespace(prefix, namespaceURI, definition);
- }
-
protected void addNamespace(String prefix, String namespaceURI, Definition def) {
ns2prefix.put(namespaceURI, prefix);
def.addNamespace(prefix, namespaceURI);
@@ -685,14 +684,14 @@
if (operationInfo.isOneWay()) {
operation.setStyle(OperationType.ONE_WAY);
}
- addExtensibilityElements(operation, getWSDL11Extensors(operationInfo));
+ addExtensibilityElements(def, operation, getWSDL11Extensors(operationInfo));
Input input = def.createInput();
addDocumentation(input, operationInfo.getInput().getDocumentation());
input.setName(operationInfo.getInputName());
Message message = def.createMessage();
buildMessage(message, operationInfo.getInput(), def);
- this.addExtensibilityAttributes(input, getInputExtensionAttributes(operationInfo));
- this.addExtensibilityElements(input, getWSDL11Extensors(operationInfo.getInput()));
+ this.addExtensibilityAttributes(def, input, getInputExtensionAttributes(operationInfo));
+ this.addExtensibilityElements(def, input, getWSDL11Extensors(operationInfo.getInput()));
input.setMessage(message);
operation.setInput(input);
operation.setParameterOrdering(operationInfo.getParameterOrdering());
@@ -703,8 +702,8 @@
output.setName(operationInfo.getOutputName());
message = def.createMessage();
buildMessage(message, operationInfo.getOutput(), def);
- this.addExtensibilityAttributes(output, getOutputExtensionAttributes(operationInfo));
- this.addExtensibilityElements(output, getWSDL11Extensors(operationInfo.getOutput()));
+ this.addExtensibilityAttributes(def, output, getOutputExtensionAttributes(operationInfo));
+ this.addExtensibilityElements(def, output, getWSDL11Extensors(operationInfo.getOutput()));
output.setMessage(message);
operation.setOutput(output);
}
@@ -717,8 +716,8 @@
fault.setName(faultInfo.getFaultName().getLocalPart());
message = def.createMessage();
buildMessage(message, faultInfo, def);
- this.addExtensibilityAttributes(fault, faultInfo.getExtensionAttributes());
- this.addExtensibilityElements(fault, getWSDL11Extensors(faultInfo));
+ this.addExtensibilityAttributes(def, fault, faultInfo.getExtensionAttributes());
+ this.addExtensibilityElements(def, fault, getWSDL11Extensors(faultInfo));
fault.setMessage(message);
operation.addFault(fault);
}
Added: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/Hello.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/Hello.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/Hello.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.tools.fortest.cxf4877;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.Action;
+
+@WebService(targetNamespace = "http://foo.com/HelloWorld", name = "HelloWorld")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Hello {
+
+ @WebResult(partName = "out", name = "out")
+ @WebMethod
+ @Action
+ String echoFoo(@WebParam(partName = "in", name = "in") String s);
+
+ @WebResult
+ @WebMethod
+ @Action
+ SayHiResponse sayHi(SayHi s);
+}
Added: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/HelloImpl.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/HelloImpl.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/HelloImpl.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.cxf4877;
+
+import javax.jws.WebService;
+
+@WebService(serviceName = "HelloService",
+ portName = "HelloPort",
+ endpointInterface = "org.apache.cxf.tools.fortest.cxf4877.Hello",
+ targetNamespace = "http://foo.com/MyImpl")
+public class HelloImpl {
+ public String echoFoo(String s) {
+ return s;
+ }
+
+ public SayHiResponse sayHi(SayHi s) {
+ return new SayHiResponse();
+ }
+}
Added: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHi.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHi.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHi.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.cxf4877;
+
+public class SayHi {
+
+ /**
+ * Describe msg here.
+ */
+ private String msg;
+
+ /**
+ * Get the <code>Msg</code> value.
+ *
+ * @return a <code>String</code> value
+ */
+ public final String getMsg() {
+ return msg;
+ }
+
+ /**
+ * Set the <code>Msg</code> value.
+ *
+ * @param newMsg The new Msg value.
+ */
+ public final void setMsg(final String newMsg) {
+ this.msg = newMsg;
+ }
+}
Added: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHiResponse.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHiResponse.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf4877/SayHiResponse.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.cxf4877;
+
+public class SayHiResponse {
+
+ /**
+ * Describe msg here.
+ */
+ private String msg;
+
+ /**
+ * Get the <code>Msg</code> value.
+ *
+ * @return a <code>String</code> value
+ */
+ public final String getMsg() {
+ return msg;
+ }
+
+ /**
+ * Set the <code>Msg</code> value.
+ *
+ * @param newMsg The new Msg value.
+ */
+ public final void setMsg(final String newMsg) {
+ this.msg = newMsg;
+ }
+}
Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java 2013-07-03 08:58:50 UTC (rev 17760)
+++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java 2013-07-03 11:09:36 UTC (rev 17761)
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.processor;
import java.io.File;
+import java.io.FileInputStream;
import java.net.URI;
import java.util.List;
@@ -36,6 +37,7 @@
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.WSDLHelper;
import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
@@ -587,7 +589,7 @@
assertTrue(getStringFromFile(requestWrapperClass).indexOf(expectedString) != -1);
}
- // Generated schema should use unquolified form in the jaxws case
+ // Generated schema should use unqualified form in the jaxws case
@Test
public void testAction() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/action.wsdl");
@@ -700,6 +702,20 @@
assertTrue(wsdlContent.indexOf("wsdl:part name=\"add1\" element=\"tns:add1\"") != -1);
}
+ @Test
+ public void testCXF4877() throws Exception {
+ env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/testwsdl.wsdl");
+ env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.cxf4877.HelloImpl");
+ env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
+
+ processor.setEnvironment(env);
+ processor.process();
+
+ File wsdlFile = new File(output, "HelloWorld.wsdl");
+ assertTrue(wsdlFile.exists());
+ //if the test works, this won't throw an exception. CXF-4877 generated bad XML at this point
+ StaxUtils.read(new FileInputStream(wsdlFile));
+ }
@Test
10 years, 9 months
- 1
- 0
JBossWS SVN: r17760 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-03 04:58:50 -0400 (Wed, 03 Jul 2013)
New Revision: 17760
Added:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-980779/
Removed:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1/
Log:
Renamed to include BZ number
10 years, 9 months
- 1
- 0
JBossWS SVN: r17759 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-07-03 04:57:26 -0400 (Wed, 03 Jul 2013)
New Revision: 17759
Added:
thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1/
Log:
[BZ-980779] Create one of patch branch
10 years, 9 months
- 1
- 0
JBossWS SVN: r17758 - in projects/wsi-bp-test/trunk: bp20-tests/src/test/java/org/jboss/test/ws/jaxws/bp20/basedoc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2013-07-02 05:55:30 -0400 (Tue, 02 Jul 2013)
New Revision: 17758
Modified:
projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/BaseTypesDocTestCase.java
projects/wsi-bp-test/trunk/bp20-tests/src/test/java/org/jboss/test/ws/jaxws/bp20/basedoc/BaseTypesDocTestCase.java
Log:
wsi-bp-test - BaseTypesDocTestCase fix - replace hardcoded localhost
Modified: projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/BaseTypesDocTestCase.java
===================================================================
--- projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/BaseTypesDocTestCase.java 2013-07-01 08:32:29 UTC (rev 17757)
+++ projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/BaseTypesDocTestCase.java 2013-07-02 09:55:30 UTC (rev 17758)
@@ -40,7 +40,7 @@
public class BaseTypesDocTestCase extends BP12TestCase
{
- private final String serviceURL = "http://localhost:8080/jaxws-bp12basedoc/BPBaseDoc";
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-bp12basedoc/BPBaseDoc";
public static Test suite()
{
Modified: projects/wsi-bp-test/trunk/bp20-tests/src/test/java/org/jboss/test/ws/jaxws/bp20/basedoc/BaseTypesDocTestCase.java
===================================================================
--- projects/wsi-bp-test/trunk/bp20-tests/src/test/java/org/jboss/test/ws/jaxws/bp20/basedoc/BaseTypesDocTestCase.java 2013-07-01 08:32:29 UTC (rev 17757)
+++ projects/wsi-bp-test/trunk/bp20-tests/src/test/java/org/jboss/test/ws/jaxws/bp20/basedoc/BaseTypesDocTestCase.java 2013-07-02 09:55:30 UTC (rev 17758)
@@ -39,7 +39,7 @@
public class BaseTypesDocTestCase extends BP20Test
{
- private final String serviceURL = "http://localhost:8080/jaxws-bp20basedoc/BPBaseDoc";
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-bp20basedoc/BPBaseDoc";
public static Test suite()
{
@@ -153,4 +153,4 @@
System.out.println("retAnyUri.result=" + _retAnyUri__return);
}
-}
\ No newline at end of file
+}
10 years, 9 months
- 1
- 0
JBossWS SVN: r17757 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-01 04:32:29 -0400 (Mon, 01 Jul 2013)
New Revision: 17757
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/application.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3655]:Add a test to demonstrate import schema file from the ear deployment classloader
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-07-01 08:29:30 UTC (rev 17756)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-07-01 08:32:29 UTC (rev 17757)
@@ -67,7 +67,7 @@
<attribute name="Dependencies" value="org.apache.cxf"/>
</manifest>
</jar>
-
+
<!-- jaxws-cxf-bus-servlet-client -->
<war destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-servlet-client.war"
manifest="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF/MANIFEST.MF"
@@ -388,6 +388,34 @@
<include name="alice.jks" />
</metainf>
</jar>
+
+ <!-- jaxws-cxf-jbws3655-->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655-jaxws.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3655/META-INF">
+ <include name="**/*" />
+ <exclude name="**/application.xml"/>
+ </metainf>
+ </jar>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655-ejb.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.class"/>
+ </fileset>
+ </jar>
+
+ <ear destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655.ear" appxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3655/META-INF/application.xml">
+ <zipfileset dir="${tests.output.dir}/test-libs/" prefix="lib">
+ <include name="jaxws-cxf-jbws3655-jaxws.jar"/>
+ </zipfileset>
+ <fileset dir="${tests.output.dir}/test-libs/" includes="jaxws-cxf-jbws3655-ejb.jar"/>
+ </ear>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,60 @@
+/*
+ * 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.cxf.jbws3655;
+
+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;
+
+public class EarSchemaImportTestCase extends JBossWSTest
+{
+ public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3655/HelloService";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EarSchemaImportTestCase.class, "jaxws-cxf-jbws3655.ear");
+ }
+
+ public void testSchemaImport() throws Exception
+ {
+ HelloWs port = getPort(endpointAddress);
+ HelloRequest request = new HelloRequest();
+ request.setInput("hello");
+ HelloResponse response = port.doHello(request);
+ assertEquals(2, response.getMultiHello().size());
+
+ }
+
+ private HelloWs getPort(String publishURL) throws Exception
+ {
+ URL wsdlURL = new URL(publishURL + "?wsdl");
+ QName qname = new QName("http://hello/test", "HelloService");
+ Service service = Service.create(wsdlURL, qname);
+ return (HelloWs)service.getPort(HelloWs.class);
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,38 @@
+/*
+ * 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.cxf.jbws3655;
+
+public class HelloRequest
+{
+ private String input;
+
+ public String getInput()
+ {
+ return input;
+ }
+
+ public void setInput(String input)
+ {
+ this.input = input;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,41 @@
+/*
+ * 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.cxf.jbws3655;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HelloResponse
+{
+ private List<String> multiHello = new ArrayList<String>();
+
+ public List<String> getMultiHello()
+ {
+ return multiHello;
+ }
+
+ public void setMultiHello(List<String> multiHello)
+ {
+ this.multiHello = multiHello;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,46 @@
+/*
+ * 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.cxf.jbws3655;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import org.jboss.ws.api.annotation.WebContext;
+
+@Stateless
+@WebService(wsdlLocation = "META-INF/wsdl/Hello.wsdl",
+name = HelloWs.NAME,
+serviceName = HelloWs.NAME,
+targetNamespace = HelloWs.TARGET_NAMESPACE,
+endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs")
+@WebContext(contextRoot = "/jaxws-cxf-jbws3655", urlPattern = HelloWs.NAME)
+public class HelloWSEJBImpl implements HelloWs
+{
+
+ public HelloResponse doHello(HelloRequest request)
+ {
+ HelloResponse response = new HelloResponse();
+ response.getMultiHello().add(request.getInput());
+ response.getMultiHello().add("world");
+ return response;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,33 @@
+/*
+ * 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.cxf.jbws3655;
+import javax.jws.WebService;
+
+@WebService(name = HelloWs.NAME, targetNamespace = HelloWs.TARGET_NAMESPACE)
+public interface HelloWs
+{
+ public final static String NAME = "HelloService";
+
+ public final static String TARGET_NAMESPACE = "http://hello/test";
+
+ public HelloResponse doHello(HelloRequest request);
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.java 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,38 @@
+/*
+ * 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 theb 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.jbws3655;
+import javax.jws.WebService;
+@WebService(wsdlLocation = "META-INF/wsdl/Hello.wsdl",
+name = HelloWs.NAME,
+serviceName = HelloWs.NAME,
+targetNamespace = HelloWs.TARGET_NAMESPACE,
+endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs")
+public class HelloWsImpl implements HelloWs
+{
+ public HelloResponse doHello(HelloRequest request)
+ {
+ HelloResponse response = new HelloResponse();
+ response.getMultiHello().add(request.getInput());
+ response.getMultiHello().add("world");
+ return response;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/application.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/application.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/application.xml 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd">
+ <application-name>jbws3655</application-name>
+ <module>
+ <ejb>jaxws-cxf-jbws3655-ejb.jar</ejb>
+ </module>
+ <library-directory>lib</library-directory>
+</application>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/application.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="HelloService" targetNamespace="http://hello/test" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://hello/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<schema xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://hello/test" schemaLocation="Hello_schema1.xsd"/>
+</schema>
+ </wsdl:types>
+ <wsdl:message name="doHello">
+ <wsdl:part name="parameters" element="tns:doHello">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="doHelloResponse">
+ <wsdl:part name="parameters" element="tns:doHelloResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="HelloService">
+ <wsdl:operation name="doHello">
+ <wsdl:input name="doHello" message="tns:doHello">
+ </wsdl:input>
+ <wsdl:output name="doHelloResponse" message="tns:doHelloResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="doHello">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="doHello">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="doHelloResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloService">
+ <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding">
+ <soap:address location="http://localhost:9090/HelloServicePort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd 2013-07-01 08:32:29 UTC (rev 17757)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><xs:schema xmlns:tns="http://hello/test" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" targetNamespace="http://hello/test" version="1.0">
+<xs:element name="doHello" type="tns:doHello"/>
+<xs:element name="doHelloResponse" type="tns:doHelloResponse"/>
+<xs:complexType name="doHello">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/>
+ </xs:sequence>
+ </xs:complexType>
+<xs:complexType name="helloRequest">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="hello" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+<xs:complexType name="doHelloResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="tns:helloResponse"/>
+ </xs:sequence>
+ </xs:complexType>
+<xs:complexType name="helloResponse">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 9 months
- 1
- 0