April 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17506 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2013-04-17 15:39:50 -0400 (Wed, 17 Apr 2013) New Revision: 17506 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java Log: [JBPAPP-10687] Avoid NullPointerException when spring bean is not annotated with @WebService or @WebServiceProvider Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17 07:16:51 UTC (rev 17505) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-04-17 19:39:50 UTC (rev 17506) @@ -248,7 +248,7 @@ wl = epIfWsa.wsdlLocation(); } } - } else { + } else if (clazz.isAnnotationPresent(WebServiceProvider.class)) { WebServiceProvider wsp = clazz.getAnnotation(WebServiceProvider.class); wl = wsp.wsdlLocation(); }

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17505 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-17 03:16:51 -0400 (Wed, 17 Apr 2013) New Revision: 17505 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3622] Restoring tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-16 22:27:18 UTC (rev 17504) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-17 07:16:51 UTC (rev 17505) @@ -71,10 +71,9 @@ } else { - sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("keystore-password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("alias", "tomcat"); + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); } setup.setHttpsConnectorRequirement(sslOptions); return setup; @@ -126,10 +125,6 @@ */ public void test2121() throws Exception { - if (true) { - System.out.println("FIXME: [JBWS-3622] Restore HTTPS tests w/ Undertow"); - return; - } Service service = Service.create(new URL(serviceURLHttps + "SecurityService2121?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2121Port"), ServiceIface.class); setupWsse(proxy); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 22:27:18 UTC (rev 17504) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-17 07:16:51 UTC (rev 17505) @@ -839,11 +839,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17503 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 16:24:30 -0400 (Tue, 16 Apr 2013) New Revision: 17503 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java Log: Minor tuning Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2013-04-16 20:24:14 UTC (rev 17502) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2013-04-16 20:24:30 UTC (rev 17503) @@ -31,8 +31,11 @@ */ public class InvocationContext extends AbstractExtensible { + private Object targetBean; - private Object targetBean; + public InvocationContext() { + super(4, 4); + } public Object getTargetBean() {

11 years, 8 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 16:24:14 -0400 (Tue, 16 Apr 2013) New Revision: 17502 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java Log: Fixing javadoc 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 2013-04-16 20:23:50 UTC (rev 17501) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployer/Deployer.java 2013-04-16 20:24:14 UTC (rev 17502) @@ -61,10 +61,10 @@ /** * Adds a test https connector * - * @param sslOptions + * @param options * @throws Exception */ - public void addHttpsConnector(Map<String, String> sslOptions) throws Exception; + public void addHttpsConnector(Map<String, String> options) throws Exception; /** * Remove the test https connector

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17501 - common/trunk/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 16:23:50 -0400 (Tue, 16 Apr 2013) New Revision: 17501 Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java Log: Minor tuning Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2013-04-16 16:33:53 UTC (rev 17500) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeployment.java 2013-04-16 20:23:50 UTC (rev 17501) @@ -52,7 +52,7 @@ DefaultDeployment(String name, ClassLoader classLoader) { - super(8, 4); + super(12, 4); simpleName = name; state = DeploymentState.UNDEFINED; initialLoader = classLoader;

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17500 - 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: alessio.soldano(a)jboss.com Date: 2013-04-16 12:33:53 -0400 (Tue, 16 Apr 2013) New Revision: 17500 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java Log: [JBWS-3622] Updating tests, still excluded waiting for AS8 PR to be merged Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-16 16:26:09 UTC (rev 17499) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-16 16:33:53 UTC (rev 17500) @@ -65,10 +65,9 @@ } else { - sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("keystore-password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("alias", "tomcat"); + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); } setup.setHttpsConnectorRequirement(sslOptions); return setup; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-16 16:26:09 UTC (rev 17499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-16 16:33:53 UTC (rev 17500) @@ -65,10 +65,9 @@ } else { - sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("keystore-password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("alias", "tomcat"); + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); } setup.setHttpsConnectorRequirement(sslOptions); return setup; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-16 16:26:09 UTC (rev 17499) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-16 16:33:53 UTC (rev 17500) @@ -69,19 +69,20 @@ { sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) sslOptions.put("key-alias", "tomcat"); + //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("verify-client", "true"); sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); sslOptions.put("ca-certificate-password", "changeit"); } else { - sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("keystore-password", "changeit"); - sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) - sslOptions.put("alias", "tomcat"); - sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); - sslOptions.put("ca-certificate-password", "changeit"); + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); + //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("authentication.truststore.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.truststore")); + sslOptions.put("authentication.truststore.keystore-password", "changeit"); } setup.setHttpsConnectorRequirement(sslOptions); return setup;

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17499 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:26:09 -0400 (Tue, 16 Apr 2013) New Revision: 17499 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-6850] Restoring test passing after Undertow upgrade Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:22:51 UTC (rev 17498) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:26:09 UTC (rev 17499) @@ -847,9 +847,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  - <exclude>org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17498 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:22:51 -0400 (Tue, 16 Apr 2013) New Revision: 17498 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Restoring passing test (after AS8 upgrade to Undertow 1.0.0.Alpha9) Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:18:19 UTC (rev 17497) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:22:51 UTC (rev 17498) @@ -850,9 +850,6 @@  <exclude>org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17497 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:18:19 -0400 (Tue, 16 Apr 2013) New Revision: 17497 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [CXF-4875] Restoring tests after having moved to cxf 2.7.4 + fixing few policy namespaces Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2013-04-16 16:18:19 UTC (rev 17497) @@ -2,10 +2,10 @@ xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd + http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing> @@ -17,7 +17,7 @@ <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> <jaxws:features> <p:policies> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> </p:policies> </jaxws:features> </jaxws:endpoint> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2013-04-16 16:18:19 UTC (rev 17497) @@ -3,7 +3,7 @@ xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing> @@ -43,7 +43,7 @@ <wsdl:service name="RMService"> <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc"/> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:54 UTC (rev 17496) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:18:19 UTC (rev 17497) @@ -656,10 +656,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -721,10 +717,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -783,10 +775,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> @@ -859,10 +847,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> -  <exclude>org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase*</exclude>

11 years, 8 months

1
0
0 / 0

JBossWS SVN: r17496 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:09:54 -0400 (Tue, 16 Apr 2013) New Revision: 17496 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-537] Adding testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-16 16:09:00 UTC (rev 17495) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-16 16:09:54 UTC (rev 17496) @@ -155,6 +155,26 @@ prefix="WEB-INF/lib/"/> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-embedded-fail.war" + webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF"> + <include name="beans.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/spring/" + prefix="WEB-INF/lib/"/> + <zipfileset + dir="${tests.output.dir}/cxf-embedded/" + prefix="WEB-INF/lib/"/> + <manifest> + <attribute name="Dependencies" value="javax.wsdl4j.api,org.apache.ws.xmlschema,org.apache.neethi,org.codehaus.woodstox"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2013-04-16 16:09:54 UTC (rev 17496) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.noIntegration; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; + +/** + * [AS7-537] Filter Apache CXF and dependencies + * + * Verifies deployment fails if the webservices subsystem is not disabled for the current deployment + * + * @author alessio.soldano(a)jboss.com + * @since 15-Apr-2013 + */ +public class AS7537TestCase extends JBossWSTest +{ + public void testFailureWithoutJBossDeploymentStructure() throws Exception { + boolean undeploy = true; + try { + JBossWSTestHelper.deploy("jaxws-cxf-embedded-fail.war"); + fail("Deployment failure expected"); + } catch (Exception e) { + undeploy = false; + assertTrue(e.getMessage().contains("JBAS015599")); + } finally { + if (undeploy) { + try { + JBossWSTestHelper.undeploy("jaxws-cxf-embedded-fail.war"); + } catch (Exception e) { + //ignore + } + } + } + } +} Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:00 UTC (rev 17495) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 16:09:54 UTC (rev 17496) @@ -659,6 +659,9 @@  <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -721,6 +724,9 @@  <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -780,6 +786,9 @@  <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin> @@ -859,6 +868,9 @@  <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> </excludes> </configuration> </plugin>

11 years, 8 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 April 2013