JBossWS SVN: r18482 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 10:15:00 -0500 (Fri, 07 Mar 2014)
New Revision: 18482
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java
Log:
[JBWS-3736] Fixing testcase
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2014-03-07 14:19:31 UTC (rev 18481)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2014-03-07 15:15:00 UTC (rev 18482)
@@ -64,6 +64,6 @@
//we expect the published wsdl to have the https protocol in the soap:address because the original wsdl provided
//in the deployment has that. This shows that the reference to the wsdl in endpoint interface has been processed
//when rewriting the soap:address. If we got http protocol here, the fix won't be in place.
- assertTrue(wsdl.contains("https://" + getServerHost() + ":8080/jaxws-jbws3736"));
+ assertTrue(wsdl.contains("https://" + getServerHost() + ":8443/jaxws-jbws3736"));
}
}
10 years, 9 months
JBossWS SVN: r18481 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 09:19:31 -0500 (Fri, 07 Mar 2014)
New Revision: 18481
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
[JBWS-3767] Avoid throwing/catching exception when JASPIC is not available (performance issue) - server side
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-07 14:00:31 UTC (rev 18480)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-03-07 14:19:31 UTC (rev 18481)
@@ -27,6 +27,7 @@
import org.apache.cxf.frontend.ServerFactoryBean;
import org.jboss.ws.api.annotation.EndpointConfig;
+import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.WSFException;
@@ -163,19 +164,20 @@
throw Messages.MESSAGES.couldNotReadConfigFile(configFile);
}
}
- try
+ //JASPI
+ final JASPIAuthenticationProvider jaspiProvider = (JASPIAuthenticationProvider) ServiceLoader.loadService(
+ JASPIAuthenticationProvider.class.getName(), null, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ if (jaspiProvider == null)
{
- final JASPIAuthenticationProvider jaspiProvider = SPIProvider.getInstance().getSPI(JASPIAuthenticationProvider.class,
- ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
- if (jaspiProvider != null && jaspiProvider.enableServerAuthentication(endpoint, depEndpoints.get(0)))
+ Loggers.DEPLOYMENT_LOGGER.cannotFindJaspiClasses();
+ }
+ else
+ {
+ if (jaspiProvider.enableServerAuthentication(endpoint, depEndpoints.get(0)))
{
endpoint.getInInterceptors().add(new AutenticationMgrSubjectCreatingInterceptor());
}
}
- catch (WSFException e)
- {
- Loggers.DEPLOYMENT_LOGGER.cannotFindJaspiClasses();
- }
}
}
10 years, 9 months
JBossWS SVN: r18480 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 09:00:31 -0500 (Fri, 07 Mar 2014)
New Revision: 18480
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
Log:
Further increate test timeout to prevent failures on Hudson host due to slow cpu
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-07 13:56:54 UTC (rev 18479)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-07 14:00:31 UTC (rev 18480)
@@ -65,7 +65,7 @@
Service service = Service.create(wsdlURL, serviceName);
AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class);
setupWsse(proxy);
- ((BindingProvider)proxy).getRequestContext().put(Message.RECEIVE_TIMEOUT, 90000);
+ ((BindingProvider)proxy).getRequestContext().put(Message.RECEIVE_TIMEOUT, 120000);
assertEquals("Secure Hello World!", proxy.sayHello());
} catch (Exception e) {
throw CryptoHelper.checkAndWrapException(e);
10 years, 9 months
JBossWS SVN: r18479 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 08:56:54 -0500 (Fri, 07 Mar 2014)
New Revision: 18479
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3736] Fixing build
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-03-07 13:38:28 UTC (rev 18478)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-03-07 13:56:54 UTC (rev 18479)
@@ -1391,6 +1391,17 @@
</classes>
</war>
+ <!-- jaxws-jbws3736 -->
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3736.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3736/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3736/*TestCase.class" />
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3736/META-INF">
+ <include name="wsdl/*" />
+ </metainf>
+ </jar>
+
<!-- jaxws-jbws3753 -->
<war destfile="${tests.output.dir}/test-libs/jaxws-jbws3753.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3753/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
10 years, 9 months
JBossWS SVN: r18478 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: java/org/jboss/test/ws/jaxws/jbws3736 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 08:38:28 -0500 (Fri, 07 Mar 2014)
New Revision: 18478
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/Endpoint.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/EndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/test.wsdl
Log:
[JBWS-3736] Adding testcase
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/Endpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/Endpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/Endpoint.java 2014-03-07 13:38:28 UTC (rev 18478)
@@ -0,0 +1,37 @@
+/*
+ * 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.jbws3736;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebService
+(
+ name = "Endpoint",
+ targetNamespace = "http://org.jboss.ws/jbws3736",
+ wsdlLocation = "META-INF/wsdl/test.wsdl"
+)
+public interface Endpoint
+{
+ String echo(String input);
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/Endpoint.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/EndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/EndpointImpl.java 2014-03-07 13:38:28 UTC (rev 18478)
@@ -0,0 +1,47 @@
+/*
+ * 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.jbws3736;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.ws.api.annotation.WebContext;
+
+@Stateless
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebContext(contextRoot="jaxws-jbws3736", urlPattern="/*")
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3736.Endpoint",
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ targetNamespace = "http://org.jboss.ws/jbws3736"
+)
+public class EndpointImpl implements Endpoint
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ return input;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/EndpointImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2014-03-07 13:38:28 UTC (rev 18478)
@@ -0,0 +1,69 @@
+/*
+ * 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.jbws3736;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3736] soap:address rewrite does not consider wsdlLocation in SEI @WebService
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 07-Mar-2014
+ */
+public class JBWS3736TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3736";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3736TestCase.class, "jaxws-jbws3736.jar");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws3736", "EndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS);
+ String retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+
+ public void testAddressRewrite() throws Exception
+ {
+ String wsdl = IOUtils.readAndCloseStream(new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl").openStream());
+ //we expect the published wsdl to have the https protocol in the soap:address because the original wsdl provided
+ //in the deployment has that. This shows that the reference to the wsdl in endpoint interface has been processed
+ //when rewriting the soap:address. If we got http protocol here, the fix won't be in place.
+ assertTrue(wsdl.contains("https://" + getServerHost() + ":8080/jaxws-jbws3736"));
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/test.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/test.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/test.wsdl 2014-03-07 13:38:28 UTC (rev 18478)
@@ -0,0 +1,53 @@
+<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/jbws3736'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://org.jboss.ws/jbws3736'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+ xmlns:foo='http://foo.org/foo'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/jbws3736' version='1.0' xmlns:tns='http://org.jboss.ws/jbws3736' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Endpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <message name='Endpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <portType name='Endpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:Endpoint_echo'></input>
+ <output message='tns:Endpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='https://${jboss.bind.address}/jaxws-jbws3736'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3736/META-INF/wsdl/test.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 9 months
JBossWS SVN: r18477 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-03-07 06:37:37 -0500 (Fri, 07 Mar 2014)
New Revision: 18477
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
Log:
Revert r18468:Add debug test to get the server response time
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-07 11:33:11 UTC (rev 18476)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-03-07 11:37:37 UTC (rev 18477)
@@ -355,9 +355,6 @@
<include name="bob.jks" />
<include name="bob.properties" />
</zipfileset>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF">
- <include name="jboss-webservices.xml"/>
- </webinf>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/>
</manifest>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-07 11:33:11 UTC (rev 18476)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-03-07 11:37:37 UTC (rev 18477)
@@ -22,11 +22,7 @@
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
import java.net.URL;
-import java.util.Iterator;
-import java.util.Set;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
@@ -75,26 +71,6 @@
throw CryptoHelper.checkAndWrapException(e);
}
}
-
- public void testResponseTime() throws Exception {
- MBeanServerConnection server = getServer();
- ObjectName sayhelloCounter = new ObjectName("org.apache.cxf:operation=\"sayHello\",*");
- Set<?> s = server.queryNames(sayhelloCounter, null);
- Iterator<?> it = s.iterator();
-
- while (it.hasNext()) {
- ObjectName mbean = (ObjectName)it.next();
- System.out.println("Object Name : " + mbean);
- Object val = server.getAttribute(mbean, "NumInvocations");
- System.out.println("Number invocation : " + val);
- Object totalTime = server.getAttribute(mbean, "TotalHandlingTime");
- System.out.println("Total handling time : " + totalTime);
- Object maxTime = server.getAttribute(mbean, "MaxResponseTime");
- System.out.println("Max Respone time : " + maxTime);
- }
- }
-
-
private void setupWsse(AnnotatedServiceIface proxy)
{
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml 2014-03-07 11:33:11 UTC (rev 18476)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jboss-webservices.xml 2014-03-07 11:37:37 UTC (rev 18477)
@@ -1,13 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-<webservices
- xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.2"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee">
-
- <property>
- <name>cxf.management.enabled</name>
- <value>true</value>
- </property>
-
-</webservices>
\ No newline at end of file
10 years, 9 months
JBossWS SVN: r18476 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-03-07 06:33:11 -0500 (Fri, 07 Mar 2014)
New Revision: 18476
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Remove the debug script(svn merge -r 18475:18468)
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 11:08:28 UTC (rev 18475)
+++ hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 11:33:11 UTC (rev 18476)
@@ -34,26 +34,6 @@
}
startJBoss() {
- #Debug use: remove this later
- if [ -e cxf-api-2.7.10.jar ]; then
- rm cxf-api-2.7.10.jar
- fi
- wget http://people.apache.org/~ema/cxf-api-2.7.10.jar
- ls -all cxf-api-2.7.10.jar
- ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/
- cp cxf-api-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/cxf-api.jar
- ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main
-
- if [ -e cxf-rt-ws-security-2.7.10.jar ]; then
- rm cxf-rt-ws-security-2.7.10.jar
- fi
- wget http://people.apache.org/~ema/cxf-rt-ws-security-2.7.10.jar
- ls -all cxf-rt-ws-security-2.7.10.jar
- ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
- cp cxf-rt-ws-security-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
- ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
- #Debug use END
-
$SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
}
10 years, 9 months
JBossWS SVN: r18475 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-03-07 06:08:28 -0500 (Fri, 07 Mar 2014)
New Revision: 18475
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Patch cxf-rt-ws-security.jar to print debug info
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 10:42:28 UTC (rev 18474)
+++ hudson/trunk/scripts/jbossws-qa.sh 2014-03-07 11:08:28 UTC (rev 18475)
@@ -43,6 +43,17 @@
ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/
cp cxf-api-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main/cxf-api.jar
ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/main
+
+ if [ -e cxf-rt-ws-security-2.7.10.jar ]; then
+ rm cxf-rt-ws-security-2.7.10.jar
+ fi
+ wget http://people.apache.org/~ema/cxf-rt-ws-security-2.7.10.jar
+ ls -all cxf-rt-ws-security-2.7.10.jar
+ ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
+ cp cxf-rt-ws-security-2.7.10.jar $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
+ ls -all $JBOSS_HOME/modules/system/layers/base/org/apache/cxf/impl/main/cxf-rt-ws-security.jar
+ #Debug use END
+
$SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
}
10 years, 9 months
JBossWS SVN: r18474 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 05:42:28 -0500 (Fri, 07 Mar 2014)
New Revision: 18474
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/Endpoint.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/EndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
Adding testcases for [JBWS-3741] and [JBWS-3743]
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-03-07 10:33:16 UTC (rev 18473)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-03-07 10:42:28 UTC (rev 18474)
@@ -1433,6 +1433,14 @@
</zipfileset>
</war>
+ <!-- jaxws-misc -->
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-misc.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/misc/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/misc/*TestCase.class" />
+ </fileset>
+ </jar>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/Endpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/Endpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/Endpoint.java 2014-03-07 10:42:28 UTC (rev 18474)
@@ -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.misc;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/misc")
+public interface Endpoint
+{
+ String echo(String input);
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/Endpoint.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/EndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/EndpointImpl.java 2014-03-07 10:42:28 UTC (rev 18474)
@@ -0,0 +1,48 @@
+/*
+ * 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.misc;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.ws.api.annotation.WebContext;
+
+@Stateless
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebContext(contextRoot="jaxws-misc", urlPattern="/endpoint")
+@WebService
+(
+ name = "Endpoint",
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ targetNamespace = "http://org.jboss.ws/misc"
+)
+public class EndpointImpl implements Endpoint
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ return input;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/EndpointImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java 2014-03-07 10:42:28 UTC (rev 18474)
@@ -0,0 +1,84 @@
+/*
+ * 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.misc;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Misc tests that require a simple ws endpoint deployment
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 07-Mar-2014
+ */
+public class MiscTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-misc/endpoint";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(MiscTestCase.class, "jaxws-misc.jar");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/misc", "EndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ String retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+
+ /**
+ * [JBWS-3741] WebService doesn't support "//"
+ *
+ */
+ public void testJBWS3741() throws Exception
+ {
+ assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080//jaxws-misc/endpoint?wsdl").openStream()).contains("wsdl:definitions"));
+ assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-misc///endpoint?wsdl").openStream()).contains("wsdl:definitions"));
+ }
+
+ /**
+ * [JBWS-3743] Block HTTP GET requests with no query string
+ *
+ */
+ public void testJBWS3743() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS);
+ final HttpURLConnection c = (HttpURLConnection)wsdlURL.openConnection();
+ c.connect();
+ assertEquals(405, c.getResponseCode());
+ String error = IOUtils.readAndCloseStream(c.getErrorStream());
+ c.disconnect();
+ assertEquals("HTTP GET not supported", error);
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 9 months
JBossWS SVN: r18473 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-03-07 05:33:16 -0500 (Fri, 07 Mar 2014)
New Revision: 18473
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
Log:
Fixing test
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-03-07 10:32:48 UTC (rev 18472)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-03-07 10:33:16 UTC (rev 18473)
@@ -56,6 +56,6 @@
public void testServletAccess() throws Exception
{
- assertEquals("Hello", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/test/TestServlet").openStream()));
+ assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/test/TestServlet").openStream()).startsWith("Hello"));
}
}
10 years, 9 months