September 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r8265 - in common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211: src/main/java/org/jboss/wsf/test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 05:01:44 -0400 (Sat, 27 Sep 2008) New Revision: 8265 Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties Log: [JBPAPP-1155]-Fix Framework test case failures with EAP Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -66,6 +66,16 @@ return delegate.getServer(); } + public void login() + { + delegate.login(); + } + + public void logout() + { + delegate.logout(); + } + public boolean isTargetJBoss50() { return delegate.isTargetJBoss50(); Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -30,6 +30,13 @@ import javax.management.ObjectName; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.Dispatch; @@ -56,6 +63,9 @@ private static String implVendor; private static String implTitle; private static String implVersion; + private static LoginContext loginContext; + private static String user = System.getProperty("jmx.authentication.username"); + private static String pass = System.getProperty("jmx.authentication.password"); /** Deploy the given archive */ @@ -160,6 +170,30 @@ return server; } + public static void login() + { + try + { + if (loginContext == null) + { + loginContext = new LoginContext("Login", new AppCallbackHandler(user, pass)); + } + loginContext.login(); + } + catch (LoginException le) + { + throw new RuntimeException("Cannot login to server with username:[" + user + "], password:[" + pass + "]", le); + } + } + + public static void logout() + { + if (loginContext != null) + { + try { loginContext.logout(); } catch (LoginException ex) { } + } + } + private TestDeployer getDeployer() { return new TestDeployerJBoss(getServer()); @@ -242,4 +276,44 @@ return url; } + + public static class AppCallbackHandler implements CallbackHandler + { + + private String username; + private String password; + + public AppCallbackHandler(String usern, String passw) + { + this.username = usern; + this.password = passw; + } + + public void handle(Callback[] callbacks) throws java.io.IOException, UnsupportedCallbackException + { + for (int i = 0; i < callbacks.length; i++) + { + if (callbacks[i] instanceof NameCallback) + { + NameCallback nc = (NameCallback) callbacks[i]; + if (password == null) + nc.setName("anonymous"); + else + nc.setName(username); + } + else if (callbacks[i] instanceof PasswordCallback) + { + PasswordCallback pc = (PasswordCallback) callbacks[i]; + if (password != null) + { + pc.setPassword(password.toCharArray()); + } + } + else + { + throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback"); + } + } + } + } } Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -133,4 +133,14 @@ { return delegate.getServer(); } + + public void login() + { + delegate.login(); + } + + public void logout() + { + delegate.logout(); + } } Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties 2008-09-27 09:01:44 UTC (rev 8265) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.GA_CP01 -repository.id=1.0.0.GA_CP01 +version.id=1.0.0.GA_CP01_JBPAPP-1211 +repository.id=1.0.0.GA_CP01_JBPAPP-1211 implementation.title=JBoss Web Services - Common implementation.url=http://www.jboss.org/products/jbossws

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8264 - common/branches.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 03:14:01 -0400 (Sat, 27 Sep 2008) New Revision: 8264 Added: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/ Log: [JBPAPP-1211]-Created Branch Copied: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211 (from rev 8263, common/tags/jbossws-common-1.0.0.GA_CP01)

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8263 - framework/branches.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 03:00:04 -0400 (Sat, 27 Sep 2008) New Revision: 8263 Added: framework/branches/jbossws-framework-2.0.1.GA_CP01_JBPAPP-1211/ Log: [JBPAPP-1211]-Created Branch Copied: framework/branches/jbossws-framework-2.0.1.GA_CP01_JBPAPP-1211 (from rev 8262, framework/tags/jbossws-framework-2.0.1.GA_CP01)

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8262 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211: src/main/java/org/jboss/ws/extensions/security/element and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 02:53:28 -0400 (Sat, 27 Sep 2008) New Revision: 8262 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java Log: [JBPAPP-1211]-Patch for [JBWS-1188 - Relax requirement for wsu:id for UsernameToken] Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/ant-import-tests/build-jars-jaxrpc.xml 2008-09-27 05:34:49 UTC (rev 8261) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/ant-import-tests/build-jars-jaxrpc.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -2293,6 +2293,20 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1188.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1188/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1188/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + <include name="jboss-wsse-server.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-27 05:34:49 UTC (rev 8261) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -62,11 +62,9 @@ { this.doc = element.getOwnerDocument(); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, Timestamp is missing an id"); + if (id != null && id.length() > 0) + this.id = id; - this.id = id; - Element child = Util.getFirstChildElement(element); if (child == null || !Constants.WSU_NS.equals(child.getNamespaceURI()) || !"Created".equals(child.getLocalName())) throw new WSSecurityException("Created child expected in Timestamp element"); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-27 05:34:49 UTC (rev 8261) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -56,11 +56,9 @@ { this.doc = element.getOwnerDocument(); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, UsernameToken is missing an id"); + if (id != null && id.length() > 0) + setId(id); - setId(id); - Element child = Util.getFirstChildElement(element); if (child == null || ! Constants.WSSE_NS.equals(child.getNamespaceURI()) || ! "Username".equals(child.getLocalName())) throw new WSSecurityException("Username child expected in UsernameToken element"); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-27 05:34:49 UTC (rev 8261) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -51,11 +51,9 @@ super(element.getOwnerDocument()); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, BinarySecurityToken is missing an id"); + if (id != null && id.length() > 0) + setId(id); - setId(id); - if (! Constants.BASE64_ENCODING_TYPE.equals(element.getAttribute("EncodingType"))) throw new WSSecurityException("Invalid encoding type (only base64 is supported) for token:" + id); Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188 (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,119 +0,0 @@ -/* - * 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.jaxrpc.jbws1188; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import junit.framework.Test; - -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test case to test the UsernameToken can be sent without an id. - * - * @author mageshbk(a)jboss.com - */ -public class JBWS1188TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS1188TestCase.class, "jaxrpc-jbws1188.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - } - - public void testUsernameTokenNoID() throws Exception - { - MessageFactory factory = MessageFactory.newInstance(); - - String reqStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header>" + - " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>" + - " <wsse:UsernameToken>" + - " <wsse:Username>kermit</wsse:Username>" + - " <wsse:Password>thefrog</wsse:Password>" + - " </wsse:UsernameToken>" + - " </wsse:Security>" + - " </env:Header>" + - " <env:Body>" + - " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + - " <String_1>" + "Jimbo!" + "</String_1>" + - " </ns1:echoString>" + - " </env:Body>" + - "</env:Envelope>"; - - SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); - SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - assertEquals("Hello Jimbo!", soapElement.getValue()); - } - - public void testUsernameToken() throws Exception - { - MessageFactory factory = MessageFactory.newInstance(); - - String reqStr = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header>" + - " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + - " <wsse:UsernameToken wsu:Id='abcde-1a23bc4d-1234-1ab2'>" + - " <wsse:Username>kermit</wsse:Username>" + - " <wsse:Password>thefrog</wsse:Password>" + - " </wsse:UsernameToken>" + - " </wsse:Security>" + - " </env:Header>" + - " <env:Body>" + - " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + - " <String_1>" + "Jimbo!" + "</String_1>" + - " </ns1:echoString>" + - " </env:Body>" + - "</env:Envelope>"; - - SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); - SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - assertEquals("Hello Jimbo!", soapElement.getValue()); - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,119 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import junit.framework.Test; + +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test the UsernameToken can be sent without an id. + * + * @author mageshbk(a)jboss.com + */ +public class JBWS1188TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS1188TestCase.class, "jaxrpc-jbws1188.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + } + + public void testUsernameTokenNoID() throws Exception + { + MessageFactory factory = MessageFactory.newInstance(); + + String reqStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>" + + " <wsse:UsernameToken>" + + " <wsse:Username>kermit</wsse:Username>" + + " <wsse:Password>thefrog</wsse:Password>" + + " </wsse:UsernameToken>" + + " </wsse:Security>" + + " </env:Header>" + + " <env:Body>" + + " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + + " <String_1>" + "Jimbo!" + "</String_1>" + + " </ns1:echoString>" + + " </env:Body>" + + "</env:Envelope>"; + + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + assertEquals("Hello Jimbo!", soapElement.getValue()); + } + + public void testUsernameToken() throws Exception + { + MessageFactory factory = MessageFactory.newInstance(); + + String reqStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + + " <wsse:UsernameToken wsu:Id='abcde-1a23bc4d-1234-1ab2'>" + + " <wsse:Username>kermit</wsse:Username>" + + " <wsse:Password>thefrog</wsse:Password>" + + " </wsse:UsernameToken>" + + " </wsse:Security>" + + " </env:Header>" + + " <env:Body>" + + " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + + " <String_1>" + "Jimbo!" + "</String_1>" + + " </ns1:echoString>" + + " </env:Body>" + + "</env:Envelope>"; + + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + assertEquals("Hello Jimbo!", soapElement.getValue()); + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,35 +0,0 @@ -/* - * 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.jaxrpc.jbws1188; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author mageshbk(a)jboss.com - */ -public interface TestEndpoint extends Remote -{ - - public String echoString(final String message) throws RemoteException; - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,35 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * @author mageshbk(a)jboss.com + */ +public interface TestEndpoint extends Remote +{ + + public String echoString(final String message) throws RemoteException; + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,37 +0,0 @@ -/* - * 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.jaxrpc.jbws1188; - -import java.rmi.RemoteException; - -/** - * @author mageshbk(a)jboss.com - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoString(String message) throws RemoteException - { - return "Hello " + message; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,37 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.rmi.RemoteException; + +/** + * @author mageshbk(a)jboss.com + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public String echoString(String message) throws RemoteException + { + return "Hello " + message; + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188 (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1188</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1188/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1188'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1188'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1188'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoString</java-method-name> - <wsdl-operation>echoString</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1188</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1188/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1188'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1188'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1188'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoString</java-method-name> + <wsdl-operation>echoString</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> -</jboss-ws-security> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> +</jboss-ws-security> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <context-param> - <param-name>jbossws-config-name</param-name> - <param-value>Standard WSSecurity Endpoint</param-value> - </context-param> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpointImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard WSSecurity Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpointImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1188' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,15 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1188' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port>impl:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1188' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1188' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoString'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoStringResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoString' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoString'/> - <output message='tns:TestEndpoint_echoStringResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoString'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1188' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1188' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoString'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoStringResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoString' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoString'/> + <output message='tns:TestEndpoint_echoStringResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoString'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml 2008-09-27 05:32:07 UTC (rev 8260) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1188" type-namespace="http://org.jboss.test.ws/jbws1188/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml (from rev 8260, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/src/test/resources/jaxrpc/jbws1188/wstools-config.xml 2008-09-27 06:53:28 UTC (rev 8262) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1188" type-namespace="http://org.jboss.test.ws/jbws1188/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> +</configuration>

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8261 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 01:34:49 -0400 (Sat, 27 Sep 2008) New Revision: 8261 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211/ Log: [JBPAPP-1211]-Created Branch Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1211 (from rev 7994, stack/native/tags/jbossws-native-2.0.1.SP2_CP03)

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8260 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/extensions/security/element and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-09-27 01:32:07 -0400 (Sat, 27 Sep 2008) New Revision: 8260 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java Log: [JBBAPP-1195]-JBossWS - Relax requirement for wsu:id for UsernameToken Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml 2008-09-26 19:23:54 UTC (rev 8259) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxrpc.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -2293,6 +2293,20 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1188.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1188/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1188/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + <include name="jboss-wsse-server.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-26 19:23:54 UTC (rev 8259) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/Timestamp.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -62,11 +62,9 @@ { this.doc = element.getOwnerDocument(); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, Timestamp is missing an id"); + if (id != null && id.length() > 0) + this.id = id; - this.id = id; - Element child = Util.getFirstChildElement(element); if (child == null || !Constants.WSU_NS.equals(child.getNamespaceURI()) || !"Created".equals(child.getLocalName())) throw new WSSecurityException("Created child expected in Timestamp element"); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-26 19:23:54 UTC (rev 8259) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -56,11 +56,9 @@ { this.doc = element.getOwnerDocument(); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, UsernameToken is missing an id"); + if (id != null && id.length() > 0) + setId(id); - setId(id); - Element child = Util.getFirstChildElement(element); if (child == null || ! Constants.WSSE_NS.equals(child.getNamespaceURI()) || ! "Username".equals(child.getLocalName())) throw new WSSecurityException("Username child expected in UsernameToken element"); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-26 19:23:54 UTC (rev 8259) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/element/X509Token.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -51,11 +51,9 @@ super(element.getOwnerDocument()); String id = element.getAttributeNS(Constants.WSU_NS, Constants.ID); - if (id == null || id.length() == 0) - throw new WSSecurityException("Invalid message, BinarySecurityToken is missing an id"); + if (id != null && id.length() > 0) + setId(id); - setId(id); - if (! Constants.BASE64_ENCODING_TYPE.equals(element.getAttribute("EncodingType"))) throw new WSSecurityException("Invalid encoding type (only base64 is supported) for token:" + id); Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/JBWS1188TestCase.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,119 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import junit.framework.Test; + +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test the UsernameToken can be sent without an id. + * + * @author mageshbk(a)jboss.com + */ +public class JBWS1188TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS1188TestCase.class, "jaxrpc-jbws1188.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + } + + public void testUsernameTokenNoID() throws Exception + { + MessageFactory factory = MessageFactory.newInstance(); + + String reqStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>" + + " <wsse:UsernameToken>" + + " <wsse:Username>kermit</wsse:Username>" + + " <wsse:Password>thefrog</wsse:Password>" + + " </wsse:UsernameToken>" + + " </wsse:Security>" + + " </env:Header>" + + " <env:Body>" + + " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + + " <String_1>" + "Jimbo!" + "</String_1>" + + " </ns1:echoString>" + + " </env:Body>" + + "</env:Envelope>"; + + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + assertEquals("Hello Jimbo!", soapElement.getValue()); + } + + public void testUsernameToken() throws Exception + { + MessageFactory factory = MessageFactory.newInstance(); + + String reqStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <wsse:Security xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + + " <wsse:UsernameToken wsu:Id='abcde-1a23bc4d-1234-1ab2'>" + + " <wsse:Username>kermit</wsse:Username>" + + " <wsse:Password>thefrog</wsse:Password>" + + " </wsse:UsernameToken>" + + " </wsse:Security>" + + " </env:Header>" + + " <env:Body>" + + " <ns1:echoString xmlns:ns1='http://org.jboss.test.ws/jbws1188'>" + + " <String_1>" + "Jimbo!" + "</String_1>" + + " </ns1:echoString>" + + " </env:Body>" + + "</env:Envelope>"; + + SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1188"); + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + assertEquals("Hello Jimbo!", soapElement.getValue()); + } +} Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,35 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * @author mageshbk(a)jboss.com + */ +public interface TestEndpoint extends Remote +{ + + public String echoString(final String message) throws RemoteException; + +} Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.java 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,37 @@ +/* + * 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.jaxrpc.jbws1188; + +import java.rmi.RemoteException; + +/** + * @author mageshbk(a)jboss.com + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public String echoString(String message) throws RemoteException + { + return "Hello " + message; + } + +} Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jaxrpc-mapping.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1188</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1188/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1188'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1188'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1188'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoString</java-method-name> + <wsdl-operation>echoString</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1188'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/jboss-wsse-server.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> +</jboss-ws-security> Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/web.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard WSSecurity Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpointImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/webservices.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,15 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1188' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port>impl:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/WEB-INF/wsdl/TestService.wsdl 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1188' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1188' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoString'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoStringResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoString' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoString'/> + <output message='tns:TestEndpoint_echoStringResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoString'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1188' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1188/wstools-config.xml 2008-09-27 05:32:07 UTC (rev 8260) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1188.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1188" type-namespace="http://org.jboss.test.ws/jbws1188/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> +</configuration>

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8259 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-09-26 15:23:54 -0400 (Fri, 26 Sep 2008) New Revision: 8259 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java Log: [JBWS-2322] fix tests to be cross platform Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2008-09-26 17:32:23 UTC (rev 8258) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2008-09-26 19:23:54 UTC (rev 8259) @@ -28,6 +28,7 @@ import javax.xml.ws.BindingType; import javax.xml.ws.WebServiceException; import java.io.IOException; +import java.io.InputStream; /** * @author Heiko.Braun(a)jboss.com @@ -44,7 +45,12 @@ try { System.out.println("Recv " + data.getContentType()); - System.out.println("Got " + data.getContent()); + Object dataHandlerContent = data.getContent(); + System.out.println("Got " + dataHandlerContent); + if ( dataHandlerContent instanceof InputStream ) + { + ((InputStream)dataHandlerContent).close(); + } return new DataHandler("Server data", "text/plain"); } catch (IOException e)

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8258 - stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-09-26 13:32:23 -0400 (Fri, 26 Sep 2008) New Revision: 8258 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/version.properties Log: [JBPAPP-1216] Set version. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/version.properties 2008-09-26 17:31:36 UTC (rev 8257) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/version.properties 2008-09-26 17:32:23 UTC (rev 8258) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2 -repository.id=2.0.1.SP2 +version.id=2.0.1.SP2_JBPAPP-1216 +repository.id=2.0.1.SP2_JBPAPP-1216 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -25,7 +25,7 @@ # Dependend integration projects jbossws-spi=1.0.0.GA -jbossws-common=1.0.0.GA +jbossws-common=1.0.0.GA_JBPAPP-1216 jbossws-framework=2.0.1.GA jbossws-jboss40=2.0.1.GA jbossws-jboss42=2.0.1.GA

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8257 - common/branches/jbossws-common-1.0.0.GA_JBPAPP-1216.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-09-26 13:31:36 -0400 (Fri, 26 Sep 2008) New Revision: 8257 Modified: common/branches/jbossws-common-1.0.0.GA_JBPAPP-1216/version.properties Log: [JBPAPP-1216] Set version. Modified: common/branches/jbossws-common-1.0.0.GA_JBPAPP-1216/version.properties =================================================================== --- common/branches/jbossws-common-1.0.0.GA_JBPAPP-1216/version.properties 2008-09-26 17:27:33 UTC (rev 8256) +++ common/branches/jbossws-common-1.0.0.GA_JBPAPP-1216/version.properties 2008-09-26 17:31:36 UTC (rev 8257) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.GA -repository.id=1.0.0.GA +version.id=1.0.0.GA_JBPAPP-1216 +repository.id=1.0.0.GA_JBPAPP-1216 implementation.title=JBoss Web Services - Common implementation.url=http://www.jboss.org/products/jbossws

15 years, 7 months

1
0
0 / 0

JBossWS SVN: r8256 - in stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss: ws/core/soap and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-09-26 13:27:33 -0400 (Fri, 26 Sep 2008) New Revision: 8256 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/XMLContent.java stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java Log: [JBPAPP-1216] Clear ThreadLocals once MessageContextAssociation stack is empty (With exceptions) Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2008-09-26 17:24:29 UTC (rev 8255) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2008-09-26 17:27:33 UTC (rev 8256) @@ -102,7 +102,7 @@ if (outbound == null) throw new IllegalStateException("Cannot find property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); - MessageContextAssociation.popMessageContext(); + MessageContextAssociation.popMessageContext(false); SOAPMessageContextJAXWS resContext = new SOAPMessageContextJAXWS(reqContext); resContext.setSOAPMessage(null); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2008-09-26 17:24:29 UTC (rev 8255) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2008-09-26 17:27:33 UTC (rev 8256) @@ -28,6 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.utils.ThreadLocalAssociation; +import org.jboss.wsf.common.DOMUtils; /** * A thread local association with the current message context @@ -39,11 +40,11 @@ { // provide logging private static Logger log = Logger.getLogger(MessageContextAssociation.class); - public static void pushMessageContext(CommonMessageContext msgContext) { - if(log.isDebugEnabled()) log.debug("pushMessageContext: " + msgContext + " (Thread " +Thread.currentThread().getName()+ ")"); + if (log.isDebugEnabled()) + log.debug("pushMessageContext: " + msgContext + " (Thread " + Thread.currentThread().getName() + ")"); Stack<CommonMessageContext> stack = ThreadLocalAssociation.localMsgContextAssoc().get(); if (stack == null) { @@ -66,13 +67,24 @@ public static CommonMessageContext popMessageContext() { + return popMessageContext(true); + } + + public static CommonMessageContext popMessageContext(boolean clearDOMIfEmpty) + { CommonMessageContext msgContext = null; Stack<CommonMessageContext> stack = ThreadLocalAssociation.localMsgContextAssoc().get(); if (stack != null && stack.isEmpty() == false) { msgContext = stack.pop(); + if (stack.isEmpty() == true && clearDOMIfEmpty == true) + { + DOMUtils.clearThreadLocals(); + } } - if(log.isDebugEnabled()) log.debug("popMessageContext: " + msgContext +" (Thread " +Thread.currentThread().getName()+ ")"); + if (log.isDebugEnabled()) + log.debug("popMessageContext: " + msgContext + " (Thread " + Thread.currentThread().getName() + ")"); return msgContext; } + } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2008-09-26 17:24:29 UTC (rev 8255) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2008-09-26 17:27:33 UTC (rev 8256) @@ -73,6 +73,7 @@ // The well formed XML content of this element. private XMLFragment xmlFragment; + private Document document = DOMUtils.getOwnerDocument(); protected XMLContent(SOAPContentElement container) { @@ -329,10 +330,29 @@ short childType = child.getNodeType(); if (childType == Node.ELEMENT_NODE) { - SOAPElement soapElement = soapFactory.createElement((Element)child); - container.addChildElement(soapElement); - if (Constants.NAME_XOP_INCLUDE.equals(qname) || container.isXOPParameter()) - XOPContext.inlineXOPData(soapElement); + + boolean setOwnerDocument = (DOMUtils.peekOwnerDocument() == null); + + try + { + if (setOwnerDocument) + { + DOMUtils.setOwnerDocument(document); + } + SOAPElement soapElement = soapFactory.createElement((Element)child); + container.addChildElement(soapElement); + if (Constants.NAME_XOP_INCLUDE.equals(qname) || container.isXOPParameter()) + XOPContext.inlineXOPData(soapElement); + + } + finally + { + if (setOwnerDocument) + { + DOMUtils.clearThreadLocals(); + } + } + } else if (childType == Node.TEXT_NODE) { Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-09-26 17:24:29 UTC (rev 8255) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-09-26 17:27:33 UTC (rev 8256) @@ -317,7 +317,6 @@ // clear thread local storage ThreadLocalAssociation.clear(); - DOMUtils.clearThreadLocals(); } }

15 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2008