July 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18814 - stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-23 18:03:45 -0400 (Wed, 23 Jul 2014) New Revision: 18814 Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java Log: Print BC version and jar location Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 2014-07-23 08:06:33 UTC (rev 18813) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 2014-07-23 22:03:45 UTC (rev 18814) @@ -1,5 +1,7 @@ package org.jboss.wsf.test; +import java.security.Provider; + /** * * @author Rostislav Svoboda @@ -11,7 +13,13 @@ { System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); System.out.println("JCE unlimited strength cryptography: " + ((javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") < 256)?"NOT ":"") + "INSTALLED" ); - System.out.println("Bouncy Castle JCE Provider: " + ((java.security.Security.getProvider("BC") == null)?"NOT ":"") + "INSTALLED" ); + Provider p = java.security.Security.getProvider("BC"); + if (p != null) { + System.out.println("Bouncy Castle JCE Provider: INSTALLED (ver: " + p.getVersion() + ", " + + p.getClass().getProtectionDomain().getCodeSource().getLocation() + ")" ); + } else { + System.out.println("Bouncy Castle JCE Provider: NOT INSTALLED" ); + } System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); }

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18813 - common/trunk/src/main/java/org/jboss/ws/common/utils.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-23 04:06:33 -0400 (Wed, 23 Jul 2014) New Revision: 18813 Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java Log: Adding missing header Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java 2014-07-21 22:11:53 UTC (rev 18812) +++ common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java 2014-07-23 08:06:33 UTC (rev 18813) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.ws.common.utils; import org.jboss.ws.api.annotation.WebContext; @@ -51,7 +72,7 @@ return null; } - public static String getUrlPatternByPortComponentURI (String urlPattern, String contextRoot) { + public static String getUrlPatternByPortComponentURI(String urlPattern, String contextRoot) { if (urlPattern != null) { @@ -68,7 +89,7 @@ } - public static String getUrlPatternByPortComponentURI (JBossPortComponentMetaData portComponent) { + public static String getUrlPatternByPortComponentURI(JBossPortComponentMetaData portComponent) { String urlPattern = null; if (portComponent != null) { String portComponentURI = portComponent.getPortComponentURI();

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18812 - container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 18:11:53 -0400 (Mon, 21 Jul 2014) New Revision: 18812 Modified: container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3815] Support former log ids Modified: container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 22:10:38 UTC (rev 18811) +++ container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 22:11:53 UTC (rev 18812) @@ -428,7 +428,7 @@ String rawResult = response.get(RESULT).asString(); previousValue = rawResult.substring(13, rawResult.length() - 2); //{"value" => "xyz"} } catch (Exception e) { - if (!e.getMessage().contains("WFLYCTL0216")) { + if (!e.getMessage().contains("WFLYCTL0216") && !e.getMessage().contains("JBAS014807")) { throw e; } }

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18811 - container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 18:10:38 -0400 (Mon, 21 Jul 2014) New Revision: 18811 Modified: container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3815] Support former log ids Modified: container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 20:50:55 UTC (rev 18810) +++ container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 22:10:38 UTC (rev 18811) @@ -428,7 +428,7 @@ String rawResult = response.get(RESULT).asString(); previousValue = rawResult.substring(13, rawResult.length() - 2); //{"value" => "xyz"} } catch (Exception e) { - if (!e.getMessage().contains("WFLYCTL0216")) { + if (!e.getMessage().contains("WFLYCTL0216") && !e.getMessage().contains("JBAS014807")) { throw e; } }

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18810 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/cxf/jbws3628 and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 16:50:55 -0400 (Mon, 21 Jul 2014) New Revision: 18810 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/CheckInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOne.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOneImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl Log: [JBWS-3628] Adding testcase Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/CheckInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/CheckInterceptor.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/CheckInterceptor.java 2014-07-21 20:50:55 UTC (rev 18810) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.jbws3628; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.io.CachedOutputStream; +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; + +/** + * A server side interceptor that verifies every incoming message has WS-Addressing stuff + */ +public class CheckInterceptor extends AbstractPhaseInterceptor<Message> +{ + public CheckInterceptor() + { + super(Phase.RECEIVE); + } + + public void handleMessage(Message message) throws Fault + { + String method = (String)message.get(Message.HTTP_REQUEST_METHOD); + if (!method.equals("POST")) + { + return; + } + StringBuilder sb = new StringBuilder(); + InputStream is = message.getContent(InputStream.class); + if (is != null) + { + CachedOutputStream bos = new CachedOutputStream(); + try + { + copy(is, bos, 4096); + bos.flush(); + is.close(); + message.setContent(InputStream.class, bos.getInputStream()); + bos.writeCacheTo(sb); + bos.close(); + } + catch (IOException e) + { + throw new Fault(e); + } + } + if (!sb.toString().contains("http://www.w3.org/2005/08/addressing")) + { + throw new Fault("Could not find any reference to namespace 'http://www.w3.org/2005/08/addressing' in handled message.", + java.util.logging.Logger.getLogger(CheckInterceptor.class.getName())); + } + } + + public static int copy(final InputStream input, final OutputStream output, int bufferSize) throws IOException + { + int avail = input.available(); + if (avail > 262144) + { + avail = 262144; + } + if (avail > bufferSize) + { + bufferSize = avail; + } + final byte[] buffer = new byte[bufferSize]; + int n = 0; + n = input.read(buffer); + int total = 0; + while (-1 != n) + { + if (n == 0) + { + throw new IOException("0 bytes read in violation of InputStream.read(byte[])"); + } + output.write(buffer, 0, n); + total += n; + n = input.read(buffer); + } + return total; + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/CheckInterceptor.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/jbws3628/EndpointOne.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOne.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOne.java 2014-07-21 20:50:55 UTC (rev 18810) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.jbws3628; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3628", serviceName = "ServiceOne") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointOne +{ + String echo(String input); +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOne.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/jbws3628/EndpointOneImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOneImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOneImpl.java 2014-07-21 20:50:55 UTC (rev 18810) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.jbws3628; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.apache.cxf.interceptor.InInterceptors; +import org.jboss.logging.Logger; + +@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3628", serviceName = "ServiceOne", wsdlLocation = "WEB-INF/wsdl/service.wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@InInterceptors(interceptors="org.jboss.test.ws.jaxws.cxf.jbws3628.CheckInterceptor") +public class EndpointOneImpl +{ + @WebMethod + public String echo(String input) + { + Logger.getLogger(this.getClass()).info("echo: " + input); + return input; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/EndpointOneImpl.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/jbws3628/JBWS3628TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java 2014-07-21 20:50:55 UTC (rev 18810) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.jbws3628; + +import java.io.File; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; + +/** + * Testcase for system property expansion support in WSDL documents. + * + * @author alessio.soldano(a)jboss.com + * @since 21-Jul-2014 + */ +public class JBWS3628TestCase extends JBossWSTest +{ + private static final String POLICY_NAME = "WS-Addressing_policy"; + + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3628.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3628.CheckInterceptor.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl"), "wsdl/service.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + TestSetup setup = new JBossWSCXFTestSetup(JBWS3628TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())) { + + private static final String PROPERTY_NAME = "org.jboss.wsf.test.JBWS3628TestCase.policy"; + private String formerValue; + + @Override + public void setUp() throws Exception { + formerValue = JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, POLICY_NAME); + super.setUp(); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, formerValue); + formerValue = null; + } + }; + return setup; + } + + public void testWSDL() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3628/ServiceOne" + "?wsdl"); + checkPolicyReference(wsdlURL, POLICY_NAME); + } + + public void testInvocation() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3628/ServiceOne" + "?wsdl"); + Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/jbws3628", "ServiceOne")); + EndpointOne port = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/jbws3628", "EndpointOnePort"), EndpointOne.class); + assertEquals("Foo", port.echo("Foo")); + } + + private void checkPolicyReference(URL wsdlURL, String refId) throws Exception { + final String wsdl = IOUtils.readAndCloseStream(wsdlURL.openStream()); + assertTrue("WSDL does not contain policy reference to '" + refId + "'", wsdl.contains("<wsp:PolicyReference URI=\"#" + refId + "\"/>")); + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3628/JBWS3628TestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl 2014-07-21 20:50:55 UTC (rev 18810) @@ -0,0 +1,51 @@ +<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://org.jboss.ws.jaxws.cxf/jbws3628" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" name="ServiceOne" targetNamespace="http://org.jboss.ws.jaxws.cxf/jbws3628"> + <wsdl:message name="echoResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="arg0" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="EndpointOne"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="ServiceOneSoapBinding" type="tns:EndpointOne"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsp:PolicyReference URI="#(a)org.jboss.wsf.test.JBWS3628TestCase.policy@"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="echo"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/jbws3628" use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/jbws3628" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="ServiceOne"> + <wsdl:port binding="tns:ServiceOneSoapBinding" name="EndpointOnePort"> + <soap:address location="http://localhost:8080/jaxws-cxf-jbws3628/ServiceOne"/> + </wsdl:port> + </wsdl:service> + + <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsp="http://www.w3.org/ns/ws-policy" wsu:Id="WS-RM_Policy"> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:InactivityTimeout Milliseconds="600000"/> + <wsrmp:BaseRetransmissionInterval Milliseconds="3000"/> + <wsrmp:ExponentialBackoff/> + <wsrmp:AcknowledgementInterval Milliseconds="200"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <wsp:Policy xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" wsu:Id="WS-Addressing_policy"> + <wsam:Addressing> + <wsp:Policy/> + </wsam:Addressing> + </wsp:Policy> +</wsdl:definitions> \ No newline at end of file Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18809 - stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 16:44:46 -0400 (Mon, 21 Jul 2014) New Revision: 18809 Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3815] Add mechanism for setting system properties while running JBossWS tests Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-07-21 19:54:06 UTC (rev 18808) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-07-21 20:44:46 UTC (rev 18809) @@ -391,6 +391,11 @@ getDeployer().removeHttpsConnector(); } + public static String setSystemProperty(String propName, String propValue) throws Exception + { + return getDeployer().setSystemProperty(propName, propValue); + } + public static abstract class BaseDeployment<T extends org.jboss.shrinkwrap.api.Archive<T>> { protected T archive;

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18808 - in common/trunk/src/main/java/org/jboss/ws/common: utils and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-07-21 15:54:06 -0400 (Mon, 21 Jul 2014) New Revision: 18808 Added: common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java Log: [JBWS-3809] refactored urlPattern code into a new util class. Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2014-07-21 19:31:56 UTC (rev 18807) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2014-07-21 19:54:06 UTC (rev 18808) @@ -24,13 +24,9 @@ import static org.jboss.ws.common.integration.WSHelper.isEjbEndpoint; import static org.jboss.ws.common.integration.WSHelper.isJseEndpoint; -import java.util.StringTokenizer; - -import javax.jws.WebService; - -import org.jboss.ws.api.annotation.WebContext; import org.jboss.ws.common.Messages; import org.jboss.ws.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.utils.UrlPatternUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.HttpEndpoint; @@ -58,14 +54,11 @@ if (urlPattern == null) { urlPattern = getExplicitPattern(dep, ep); - if (urlPattern == null) + if (urlPattern == null) { urlPattern = ep.getShortName(); - + } // Always prefix with '/' - if (urlPattern.startsWith("/") == false) - urlPattern = "/" + urlPattern; - - httpEp.setURLPattern(urlPattern); + httpEp.setURLPattern(UrlPatternUtils.getUrlPattern(urlPattern)); } } } @@ -90,64 +83,30 @@ if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null && isEjbEndpoint(ep)) { EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); - urlPattern = bmd.getPortComponentURI(); - if (urlPattern != null) - { - String contextRoot = dep.getService().getContextRoot(); - - if (urlPattern.startsWith("/") == false) - urlPattern = "/" + urlPattern; - - StringTokenizer st = new StringTokenizer(urlPattern, "/"); - if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/")) - { - urlPattern = urlPattern.substring(contextRoot.length()); - } - } + urlPattern = UrlPatternUtils.getUrlPatternByPortComponentURI(bmd.getPortComponentURI(), + dep.getService().getContextRoot()); } // #3 For EJB use @WebContext.urlPattern if (urlPattern == null) { - Class<?> beanClass = ep.getTargetBeanClass(); - WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class); - if (anWebContext != null && anWebContext.urlPattern().length() > 0) - { - urlPattern = anWebContext.urlPattern(); - } - + urlPattern = UrlPatternUtils.getUrlPatternByWebContext(ep.getTargetBeanClass()); } // #4 Use @WebService if (urlPattern == null) { - Class<?> beanClass = ep.getTargetBeanClass(); - WebService webServiceAnnotation = (WebService)beanClass.getAnnotation(WebService.class); - if (webServiceAnnotation != null) - { - String name = webServiceAnnotation.name(); - urlPattern = !isEmpty(name) ? name : beanClass.getSimpleName(); - String serviceName = webServiceAnnotation.serviceName(); - if (!isEmpty(serviceName)) - { - urlPattern = serviceName + "/" + urlPattern; - } - } + urlPattern = UrlPatternUtils.getUrlPatternByWebService(ep.getTargetBeanClass()); } // TODO: WebServiceProvider ??? // #5 Use simple class name if (urlPattern == null) { - Class<?> beanClass = ep.getTargetBeanClass(); - urlPattern = beanClass.getSimpleName(); + urlPattern = UrlPatternUtils.getUrlPatternByClassname(ep.getTargetBeanClass()); } return urlPattern; } - private static boolean isEmpty(final String s) { - return s == null || s.length() == 0; - } - } Added: common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/common/utils/UrlPatternUtils.java 2014-07-21 19:54:06 UTC (rev 18808) @@ -0,0 +1,108 @@ +package org.jboss.ws.common.utils; + +import org.jboss.ws.api.annotation.WebContext; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; + +import javax.jws.WebService; +import java.util.StringTokenizer; + +/** + * Shared rules for ws endpoint urlPattern generation, + * also a single point for the rules. + * + * User: rsearls + * Date: 7/21/14 + */ +public class UrlPatternUtils { + + public static String getUrlPatternByClassname(Class<?> beanClass){ + return beanClass.getSimpleName(); + } + + + public static String getUrlPatternByWebServiceProvider(Class<?> beanClass){ + return null; + } + + + public static String getUrlPatternByWebService(Class<?> beanClass){ + String urlPattern = null; + WebService webServiceAnnotation = (WebService)beanClass.getAnnotation(WebService.class); + if (webServiceAnnotation != null) + { + String name = webServiceAnnotation.name(); + urlPattern = !isEmpty(name) ? name : beanClass.getSimpleName(); + String serviceName = webServiceAnnotation.serviceName(); + if (!isEmpty(serviceName)) + { + urlPattern = serviceName + "/" + urlPattern; + } + } + return urlPattern; + } + + + public static String getUrlPatternByWebContext(Class<?> beanClass){ + WebContext anWebContext = (WebContext)beanClass.getAnnotation(WebContext.class); + if (anWebContext != null && anWebContext.urlPattern().length() > 0) + { + return anWebContext.urlPattern(); + } + return null; + } + + public static String getUrlPatternByPortComponentURI (String urlPattern, String contextRoot) { + + if (urlPattern != null) + { + urlPattern = getUrlPattern(urlPattern); + + if (contextRoot != null) { + StringTokenizer st = new StringTokenizer(urlPattern, "/"); + if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/")) { + urlPattern = urlPattern.substring(contextRoot.length()); + } + } + } + return urlPattern; + } + + + public static String getUrlPatternByPortComponentURI (JBossPortComponentMetaData portComponent) { + String urlPattern = null; + if (portComponent != null) { + String portComponentURI = portComponent.getPortComponentURI(); + if (portComponentURI != null && portComponentURI.length() > 0) { + urlPattern = portComponentURI; + } + } + return urlPattern; + } + + + public static String getUrlPattern(String classBasename, String serviceName, String name) { + String urlPattern = !isEmpty(name) ? name : classBasename; + if (!isEmpty(serviceName)) { + urlPattern = serviceName + "/" + urlPattern; + } + return urlPattern; + } + + + public static String getUrlPattern(String classBasename, String serviceName) { + return "/" + (!serviceName.equals("") ? serviceName : classBasename); + } + + + public static String getUrlPattern(String urlPattern) { + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; + + return urlPattern; + } + + private static boolean isEmpty(final String s) { + return s == null || s.length() == 0; + } + +}

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18807 - container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 15:31:56 -0400 (Mon, 21 Jul 2014) New Revision: 18807 Modified: container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3815] Add mechanism for setting system properties while running JBossWS tests Modified: container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 19:31:39 UTC (rev 18806) +++ container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 19:31:56 UTC (rev 18807) @@ -67,6 +67,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_RESOURCE_OPERATION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELEASE_VERSION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; @@ -415,6 +416,34 @@ } } + @Override + public String setSystemProperty(String propName, String propValue) throws Exception { + if (propName == null || propName.trim().length() == 0) { + throw new IllegalArgumentException("Empty system property name specified!"); + } + ModelNode op = createOpNode("system-property=" + propName, READ_RESOURCE_OPERATION); + String previousValue = null; + try { + ModelNode response = applyUpdate(op); + String rawResult = response.get(RESULT).asString(); + previousValue = rawResult.substring(13, rawResult.length() - 2); //{"value" => "xyz"} + } catch (Exception e) { + if (!e.getMessage().contains("WFLYCTL0216")) { + throw e; + } + } + if (previousValue != null) { + op = createOpNode("system-property=" + propName, REMOVE); + applyUpdate(op); + } + if (propValue != null) { + op = createOpNode("system-property=" + propName, ADD); + op.get("value").set(propValue); + applyUpdate(op); + } + return previousValue; + } + private static void applyUpdates(final List<ModelNode> updates) throws Exception { for (final ModelNode update : updates) { applyUpdate(update);

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18806 - container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 15:31:39 -0400 (Mon, 21 Jul 2014) New Revision: 18806 Modified: container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3815] Add mechanism for setting system properties while running JBossWS tests Modified: container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 19:31:13 UTC (rev 18805) +++ container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-07-21 19:31:39 UTC (rev 18806) @@ -67,6 +67,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_RESOURCE_OPERATION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELEASE_VERSION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; @@ -415,6 +416,34 @@ } } + @Override + public String setSystemProperty(String propName, String propValue) throws Exception { + if (propName == null || propName.trim().length() == 0) { + throw new IllegalArgumentException("Empty system property name specified!"); + } + ModelNode op = createOpNode("system-property=" + propName, READ_RESOURCE_OPERATION); + String previousValue = null; + try { + ModelNode response = applyUpdate(op); + String rawResult = response.get(RESULT).asString(); + previousValue = rawResult.substring(13, rawResult.length() - 2); //{"value" => "xyz"} + } catch (Exception e) { + if (!e.getMessage().contains("WFLYCTL0216")) { + throw e; + } + } + if (previousValue != null) { + op = createOpNode("system-property=" + propName, REMOVE); + applyUpdate(op); + } + if (propValue != null) { + op = createOpNode("system-property=" + propName, ADD); + op.get("value").set(propValue); + applyUpdate(op); + } + return previousValue; + } + private static void applyUpdates(final List<ModelNode> updates) throws Exception { for (final ModelNode update : updates) { applyUpdate(update);

9 years, 9 months

1
0
0 / 0

JBossWS SVN: r18805 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployer.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-07-21 15:31:13 -0400 (Mon, 21 Jul 2014) New Revision: 18805 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java Log: [JBWS-3815] Add mechanism for setting system properties while running JBossWS tests Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-07-21 16:15:08 UTC (rev 18804) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2014-07-21 19:31:13 UTC (rev 18805) @@ -75,4 +75,14 @@ * @throws Exception */ public void removeHttpsConnector() throws Exception; + + /** + * Set a system property value on server + * + * @param propName The name of the property. + * @param propValue The value of the property; a 'null' value is to be speficied for unsetting the system property. + * @return The former value of the property, if already set or null if it's being set for the first time. + * @throws Exception + */ + public String setSystemProperty(String propName, String propValue) throws Exception; }

9 years, 9 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 July 2014