[wise-commits] wise SVN: r398 - in core/trunk: integration and 24 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-09-09 13:48:04 -0400 (Thu, 09 Sep 2010) New Revision: 398 Added: core/trunk/integration-native/ core/trunk/integration-native/pom.xml core/trunk/integration-native/src/ core/trunk/integration-native/src/main/ core/trunk/integration-native/src/main/java/ core/trunk/integration-native/src/main/resources/ core/trunk/integration-native/src/test/ core/trunk/integration-native/src/test/java/ core/trunk/integration-native/src/test/java/org/ core/trunk/integration-native/src/test/java/org/jboss/ core/trunk/integration-native/src/test/java/org/jboss/wise/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java core/trunk/integration-native/src/test/resources/ core/trunk/integration-native/src/test/resources/WEB-INF/ core/trunk/integration-native/src/test/resources/WEB-INF/wsa/ core/trunk/integration-native/src/test/resources/WEB-INF/wsa/web.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/ core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/web.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore core/trunk/integration-native/src/test/resources/WEB-INF/wsse/ core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsse/web.xml core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.keystore core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.truststore core/trunk/integration-native/src/test/resources/integration-test-log4j.xml core/trunk/integration-native/src/test/resources/jndi.properties Removed: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java core/trunk/integration/src/test/resources/WEB-INF/wsa/web.xml core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/web.xml core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml core/trunk/integration/src/test/resources/WEB-INF/wsse/web.xml core/trunk/integration/src/test/resources/WEB-INF/wsse/wsse.keystore core/trunk/integration/src/test/resources/WEB-INF/wsse/wsse.truststore Modified: core/trunk/integration/pom.xml core/trunk/pom.xml Log: [WISE-169] Moving jbossws-native specific integration tests to integration-native module Modified: core/trunk/integration/pom.xml =================================================================== --- core/trunk/integration/pom.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/pom.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,4 +1,3 @@ - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -52,22 +51,18 @@ <version>${version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <scope>test</scope> </dependency> - </dependencies> - <build> <plugins> <plugin> @@ -124,42 +119,7 @@ </webResources> </configuration> </execution> - <execution> - <id>war-wsse</id> - <phase>pre-integration-test</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webXml>${basedir}/src/test/resources/WEB-INF/wsse/web.xml</webXml> - <warName>wsse</warName> - <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> - <webappDirectory>${project.build.directory}/wsse</webappDirectory> - <warSourceExcludes>**/lib/**</warSourceExcludes> - <webResources> - <webResource> - <targetPath>WEB-INF/classes</targetPath> - <directory>${basedir}/target/test-classes/</directory> - <includes> - <include>**/wsse/*.class</include> - </includes> - <excludes> - <exclude>**/*Test.class</exclude> - </excludes> - </webResource> - <webResource> - <targetPath>WEB-INF</targetPath> - <directory>${basedir}/src/test/resources/WEB-INF/wsse/</directory> - <includes> - <include>**/*.*</include> - </includes> - </webResource> - </webResources> - </configuration> - </execution> - - <execution> <id>war-wsdlResolver</id> <phase>pre-integration-test</phase> <goals> @@ -192,71 +152,7 @@ </webResources> </configuration> </execution> - <execution> - <id>war-wsaddress</id> - <phase>pre-integration-test</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webXml>${basedir}/src/test/resources/WEB-INF/wsa/web.xml</webXml> - <warName>wsa</warName> - <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> - <webappDirectory>${project.build.directory}/wsa</webappDirectory> - <warSourceExcludes>**/lib/**</warSourceExcludes> - <webResources> - <webResource> - <targetPath>WEB-INF/classes</targetPath> - <directory>${basedir}/target/test-classes/ - </directory> - <includes> - <include>**/wsaddressing/*.class</include> - </includes> - <excludes> - <exclude>**/*Test.class</exclude> - </excludes> - </webResource> - </webResources> - </configuration> - </execution> - - <execution> - <id>war-wsaandwsse</id> - <phase>pre-integration-test</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webXml>${basedir}/src/test/resources/WEB-INF/wsaandwsse/web.xml</webXml> - <warName>wsaandwsse</warName> - <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> - <webappDirectory>${project.build.directory}/wsaandwsse</webappDirectory> - <warSourceExcludes>**/lib/**</warSourceExcludes> - <webResources> - <webResource> - <targetPath>WEB-INF/classes</targetPath> - <directory>${basedir}/target/test-classes/</directory> - <includes> - <include>**/wsaandwsse/*.class</include> - <include>**/wsaandwsse/handlers.xml</include> - </includes> - <excludes> - <exclude>**/*Test.class</exclude> - </excludes> - </webResource> - <webResource> - <targetPath>WEB-INF</targetPath> - <directory>${basedir}/src/test/resources/WEB-INF/wsaandwsse/</directory> - <includes> - <include>**/*.*</include> - </includes> - </webResource> - </webResources> - - </configuration> - </execution> - <execution> <id>war-smooks</id> <phase>pre-integration-test</phase> <goals> @@ -284,7 +180,6 @@ </execution> </executions> </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -333,29 +228,9 @@ </executions> </plugin> </plugins> - </build> + <profiles> - - <profile> - <id>native</id> - <activation> - <property> - <name>!cxf.stack</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.wise</groupId> - <artifactId>wise-core-native</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - - <profile> <id>skip.tests</id> <activation> @@ -383,7 +258,6 @@ </plugins> </build> </profile> - <profile> <id>use.endorsed.dir</id> <activation> @@ -402,7 +276,6 @@ </plugins> </build> </profile> - <profile> <id>stress.tests</id> <build> @@ -447,7 +320,6 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaandwsse; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import junit.framework.Assert; - -import org.jboss.wise.core.client.InvocationResult; -import org.jboss.wise.core.client.WSDynamicClient; -import org.jboss.wise.core.client.WSMethod; -import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; -import org.jboss.wise.core.client.factories.WSDynamicClientFactory; -import org.jboss.wise.core.handlers.LoggingHandler; -import org.jboss.wise.core.test.WiseTest; -import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler; -import org.jboss.wise.core.wsextensions.impl.WSSecurityEnabler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class WSAANDWSSEIntegrationTest extends WiseTest { - private URL warUrl = null; - - @Before - public void setUp() throws Exception { - warUrl = this.getClass().getClassLoader().getResource("wsaandwsse.war"); - deployWS(warUrl); - - } - - @Test - public void shouldRunWithoutMK() throws Exception { - URL wsdlURL = new URL(getServerHostAndPort() + "/wsaandwsse/WSAandWSSE?wsdl"); - - WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); - WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true) - .securityConfigUrl("WEB-INF/wsaandwsse/jboss-wsse-client.xml").securityConfigName("Standard WSSecurity Client") - .wsdlURL(wsdlURL.toString()).build(); - - WSMethod method = client.getWSMethod("WSAandWSSEService", "WSAandWSSEImplPort", "echoUserType"); - - method.getEndpoint().addWSExtension(new WSSecurityEnabler(client)); - method.getEndpoint().addWSExtension(new WSAddressingEnabler(client)); - method.getEndpoint().addHandler(new LoggingHandler()); - HashMap<String, Object> requestMap = new HashMap<String, Object>(); - requestMap.put("user", "SpiderMan"); - InvocationResult result = method.invoke(requestMap, null); - System.out.println(result.getMapRequestAndResult(null, null)); - Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); - client.close(); - Assert.assertEquals("Hello WSAddressingAndWSSecurity SpiderMan", results.get("result")); - } - - @After - public void tearDown() throws Exception { - undeployWS(warUrl); - } -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaandwsse; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebService(name = "WSAandWSSE", targetNamespace = "http://org.jboss/wise/wssecurity") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface WSAandWSSE { - - - /** - * - * @param user - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echoUserType( - @WebParam(name = "user", partName = "user") - String user); - -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaandwsse; - -import javax.jws.HandlerChain; -import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; - -@WebService(endpointInterface = "org.jboss.wise.test.integration.wsaandwsse.WSAandWSSE", targetNamespace = "http://org.jboss/wise/wssecurity", serviceName = "WSAandWSSEService") -@EndpointConfig(configName = "Standard WSSecurity Endpoint") -@HandlerChain(file = "handlers.xml") -public class WSAandWSSEImpl implements WSAandWSSE { - public String echoUserType(String user) { - return "Hello WSAddressingAndWSSecurity " + user; - } -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>WSAddressing Handler</handler-name> - <handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaddressing; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * - * @author alessio.soldano(a)jboss.com - * @since 23-Dic-2008 - * - */ -@WebService( name = "Hello", targetNamespace = "http://org.jboss/wise/wsaddressing" ) -@SOAPBinding( style = SOAPBinding.Style.RPC ) -public interface Hello { - - @WebMethod - @WebResult( partName = "return" ) - public String echoUserType( @WebParam( name = "user", partName = "user" ) - String user ); - -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaddressing; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; - -/** - * - * @author alessio.soldano(a)jboss.com - * @since 23-Dic-2008 - * - */ - -@WebService( endpointInterface = "org.jboss.wise.test.integration.wsaddressing.Hello", targetNamespace = "http://org.jboss/wise/wsa", serviceName = "HelloService" ) -@EndpointConfig( configName = "Standard WSAddressing Endpoint" ) -@Stateless -public class HelloImpl implements Hello { - - public String echoUserType( String user ) { - return "Hello WSAddressing"; - } -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsaddressing; - -import java.net.URL; -import java.util.Map; - -import junit.framework.Assert; - -import org.jboss.wise.core.client.InvocationResult; -import org.jboss.wise.core.client.WSDynamicClient; -import org.jboss.wise.core.client.WSEndpoint; -import org.jboss.wise.core.client.WSMethod; -import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; -import org.jboss.wise.core.client.factories.WSDynamicClientFactory; -import org.jboss.wise.core.handlers.LoggingHandler; -import org.jboss.wise.core.test.WiseTest; -import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests WS-Addressing extension in Wise - * - * @author alessio.soldano(a)jboss.com - * @since 23-Dic-2008 - */ -public class WSAddressingIntegrationTest extends WiseTest { - private URL warUrl = null; - - @Before - public void setUp() throws Exception { - warUrl = this.getClass().getClassLoader().getResource("wsa.war"); - deployWS(warUrl); - } - - @Test - @SuppressWarnings("unchecked") - public void shouldRunWithoutMK() throws Exception { - URL wsdlURL = new URL(getServerHostAndPort() + "/wsa/Hello?wsdl"); - - WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); - WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true).wsdlURL(wsdlURL - .toString()).build(); - WSMethod method = client.getWSMethod("HelloService", "HelloImplPort", "echoUserType"); - WSEndpoint wsEndpoint = method.getEndpoint(); - - wsEndpoint.addWSExtension(new WSAddressingEnabler(client)); - wsEndpoint.addHandler(new LoggingHandler()); - - Map<String, Object> args = new java.util.HashMap<String, Object>(); - args.put("user", "test"); - InvocationResult result = method.invoke(args, null); - Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); - client.close(); - Assert.assertEquals("Hello WSAddressing", results.get("result")); - } - - @After - public void tearDown() throws Exception { - undeployWS(warUrl); - } -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsse; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.3-b02- - * Generated source version: 2.0 - * - */ -@WebService(name = "Hello", targetNamespace = "http://org.jboss/wise/wssecurity") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface Hello { - - - /** - * - * @param user - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echoUserType( - @WebParam(name = "user", partName = "user") - String user); - -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsse; - -import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; -@WebService( endpointInterface = "org.jboss.wise.test.integration.wsse.Hello", targetNamespace = "http://org.jboss/wise/wssecurity", serviceName = "HelloService" ) -@EndpointConfig(configName = "Standard WSSecurity Endpoint") -public class HelloImpl implements Hello { - public String echoUserType(String user) { - return "Hello WSSecurity"; - } -} Deleted: core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java =================================================================== --- core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and - * individual contributors as indicated by the @authors tag. See the - * copyright.txt 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.wise.test.integration.wsse; - -import java.net.URL; -import java.util.Map; - -import junit.framework.Assert; - -import org.jboss.wise.core.client.InvocationResult; -import org.jboss.wise.core.client.WSDynamicClient; -import org.jboss.wise.core.client.WSEndpoint; -import org.jboss.wise.core.client.WSMethod; -import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; -import org.jboss.wise.core.client.factories.WSDynamicClientFactory; -import org.jboss.wise.core.handlers.LoggingHandler; -import org.jboss.wise.core.test.WiseTest; -import org.jboss.wise.core.wsextensions.impl.WSSecurityEnabler; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class WSSEIntegrationTest extends WiseTest { - private URL warUrl = null; - - @Before - public void setUp() throws Exception { - warUrl = this.getClass().getClassLoader().getResource("wsse.war"); - deployWS(warUrl); - - } - - @Test - public void shouldRunWithoutMK() throws Exception { - URL wsdlURL = new URL(getServerHostAndPort() + "/wsse/HelloWorld?wsdl"); - - WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); - WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true) - .securityConfigUrl("WEB-INF/wsaandwsse/jboss-wsse-client.xml").securityConfigName("Standard WSSecurity Client") - .wsdlURL(wsdlURL.toString()).build(); - - WSMethod method = client.getWSMethod("HelloService", "HelloImplPort", "echoUserType"); - WSEndpoint wsEndpoint = method.getEndpoint(); - - wsEndpoint.addHandler(new LoggingHandler()); - - wsEndpoint.addWSExtension(new WSSecurityEnabler(client)); - - Map<String, Object> args = new java.util.HashMap<String, Object>(); - args.put("user", "test"); - InvocationResult result = method.invoke(args, null); - Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); - client.close(); - Assert.assertEquals("Hello WSSecurity", results.get("result")); - } - - @After - public void tearDown() throws Exception { - undeployWS(warUrl); - } -} Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsa/web.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsa/web.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsa/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>Hello</servlet-name> - <servlet-class>org.jboss.wise.test.integration.wsaddressing.HelloImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Hello</servlet-name> - <url-pattern>/Hello</url-pattern> - </servlet-mapping> - -</web-app> - Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsaandwsse/wsse.keystore</key-store-file> - <key-store-type>jks</key-store-type> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsaandwsse/wsse.truststore</trust-store-file> - <trust-store-type>jks</trust-store-type> - <trust-store-password>jbossws</trust-store-password> - <config> - - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>jbossws</trust-store-password> - <config> - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/web.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/web.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>WSAandWSSE</servlet-name> - <servlet-class>org.jboss.wise.test.integration.wsaandwsse.WSAandWSSEImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>WSAandWSSE</servlet-name> - <url-pattern>/WSAandWSSE</url-pattern> - </servlet-mapping> - -</web-app> - Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore 2010-09-09 17:48:04 UTC (rev 398) @@ -1,69 +0,0 @@ -���� -+

*

 -�����‹�P��s!����4`���ߵ�BU�Mˢv9�g�G�)�+76t�[{E�m�b*�ۜ�Eݰ�Dk�u��A��NC�\afJ��
�28�=�^,A���p�l��=g�"k���—�??�����Dl�NO�b3�i�W����ZѼD��O���=z{��K_ˍ���~Ӱ>�Z��������w�݄���8LR�gC��L�| -�5�,�&�eR���M�7��M�K܃L�*����^�_���筝�ʌ�R)R5v^���p��D9��y$�� -� -�'k�W9E�A_Z
G�T��B}K77]J;C�5ad�[��� ��h$iU4��i|5ȴ�w�=�x���<(M*k�#��((���e&��$� -�[��Z)'������\�RH��C���Q/��֖�����Z�����bb����T*p}m�%�ΆwB���q�>���z���e� -�G�-N��B`��XkjV��OZy*����,�UD5i���Z��8
��Hc3� -�}
�����;t�ʊvl� -�|s����:V6F7 l��:�^�LG;ڂyM��ƒ�\+�J� ��<�B��V�D��Aϥ��.Ԉ\�0�r-�-�� -�J�kڀK)��~�M{�\��q�s�&9`Jx����u�<����}�o[��>�QK���/��~s'h�#ݼG�@\9h -{{�0v��ʑ:����Ps��~��GQ'�8�`��f�k����.��J�`8DE��;[8��F!�x~옼��1��3���
e��ލ�&�g��/� -�|����n��A�0�\i��:!��h��m=��(ݤy�׬��v�{p���� bO|u1�Xr���=��k�<�A��2� -Washington10USnoqualmie Pass10U - -JBoss Inc.10 UQA10U jboss.com10 *�H�� -

admin(a)jboss.com0 -050915000941Z -150913000941Z0��10 UUS10U -Washington10U - -JBoss Inc.10UDevelopment10UJason Greene1%0# *�H�� -

jason.greene@jboss.com0�
"0 - *�H�� -


 -�

->�"�t���&*u*��3��>�|/�1�W�x$�Bk�Nt6�2u��� -��Dg -wjQ�<�E���e6M��v`�������}Dk�k�gk���.���$�Ἀ�T��p��w�
-Washington10USnoqualmie Pass10U - -JBoss Inc.10 UQA10U jboss.com10 *�H�� -

admin@jboss.com� -G�y���2y��8�bP�b��M� -Some-State10 -U -SUN10 -UJWS10URootCA 20050 -050412053207Z -060412053207Z0O10 UAU10U -Some-State10 -U -SUN10 -UJWS10 -UClient0��0 - *�H�� -


 -�W�Ĺn9b|RC��J��^\B�H��˖Й0
6Q�cBjdr_l����2C-ͱ -�����t�P~d2Ǣh���[X�ٮw��U�+�`�Y2>S�b0bݫ�P�o
-Some-State10 -U -SUN10 -UJWS10URootCA 2005�
-��e��vW��uEl��r�����}�,@�tX���?e��IOe����!�K \ No newline at end of file Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore 2010-09-09 17:48:04 UTC (rev 398) @@ -1,34 +0,0 @@ -���� -�0 - *�H�� -

 -S -Washington10USnoqualmie Pass10U - -JBoss Inc.10 UQA10U jboss.com10 *�H�� -

admin(a)jboss.com0 -050802205208Z -321218205208Z0��10 UUS10U -Washington10USnoqualmie Pass10U - -JBoss Inc.10 UQA10U jboss.com10 *�H�� -

admin@jboss.com0��0 - *�H�� -


 -Washington10USnoqualmie Pass10U - -JBoss Inc.10 UQA10U jboss.com10 *�H�� -

admin@jboss.com� \ No newline at end of file Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsse/wsse.keystore</key-store-file> - <key-store-type>jks</key-store-type> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsse/wsse.truststore</trust-store-file> - <trust-store-type>jks</trust-store-type> - <trust-store-password>jbossws</trust-store-password> - <config> - - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>jbossws</trust-store-password> - <config> - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsse/web.xml =================================================================== --- core/trunk/integration/src/test/resources/WEB-INF/wsse/web.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/integration/src/test/resources/WEB-INF/wsse/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>HelloWorld</servlet-name> - <servlet-class>org.jboss.wise.test.integration.wsse.HelloImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>HelloWorld</servlet-name> - <url-pattern>/HelloWorld</url-pattern> - </servlet-mapping> - -</web-app> - Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsse/wsse.keystore =================================================================== (Binary files differ) Deleted: core/trunk/integration/src/test/resources/WEB-INF/wsse/wsse.truststore =================================================================== (Binary files differ) Property changes on: core/trunk/integration-native ___________________________________________________________________ Name: svn:ignore + target .project .classpath .settings Added: core/trunk/integration-native/pom.xml =================================================================== --- core/trunk/integration-native/pom.xml (rev 0) +++ core/trunk/integration-native/pom.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,270 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to you under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and limitations under the + License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.wise</groupId> + <artifactId>wise-integration-native</artifactId> + <version>1.2.0-SNAPSHOT</version> + <name>Wise Integration - Native</name> + <url>http://www.jboss.org/wise</url> + + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.wise</groupId> + <artifactId>wise</artifactId> + <version>1.2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.wise</groupId> + <artifactId>wise-core-native</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossall-client</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>war-wsse</id> + <phase>pre-integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webXml>${basedir}/src/test/resources/WEB-INF/wsse/web.xml</webXml> + <warName>wsse</warName> + <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> + <webappDirectory>${project.build.directory}/wsse</webappDirectory> + <warSourceExcludes>**/lib/**</warSourceExcludes> + <webResources> + <webResource> + <targetPath>WEB-INF/classes</targetPath> + <directory>${basedir}/target/test-classes/</directory> + <includes> + <include>**/wsse/*.class</include> + </includes> + <excludes> + <exclude>**/*Test.class</exclude> + </excludes> + </webResource> + <webResource> + <targetPath>WEB-INF</targetPath> + <directory>${basedir}/src/test/resources/WEB-INF/wsse/</directory> + <includes> + <include>**/*.*</include> + </includes> + </webResource> + </webResources> + </configuration> + </execution> + <execution> + <id>war-wsaddress</id> + <phase>pre-integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webXml>${basedir}/src/test/resources/WEB-INF/wsa/web.xml</webXml> + <warName>wsa</warName> + <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> + <webappDirectory>${project.build.directory}/wsa</webappDirectory> + <warSourceExcludes>**/lib/**</warSourceExcludes> + <webResources> + <webResource> + <targetPath>WEB-INF/classes</targetPath> + <directory>${basedir}/target/test-classes/ + </directory> + <includes> + <include>**/wsaddressing/*.class</include> + </includes> + <excludes> + <exclude>**/*Test.class</exclude> + </excludes> + </webResource> + </webResources> + </configuration> + </execution> + <execution> + <id>war-wsaandwsse</id> + <phase>pre-integration-test</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webXml>${basedir}/src/test/resources/WEB-INF/wsaandwsse/web.xml</webXml> + <warName>wsaandwsse</warName> + <outputDirectory>${project.build.testOutputDirectory}</outputDirectory> + <webappDirectory>${project.build.directory}/wsaandwsse</webappDirectory> + <warSourceExcludes>**/lib/**</warSourceExcludes> + <webResources> + <webResource> + <targetPath>WEB-INF/classes</targetPath> + <directory>${basedir}/target/test-classes/</directory> + <includes> + <include>**/wsaandwsse/*.class</include> + <include>**/wsaandwsse/handlers.xml</include> + </includes> + <excludes> + <exclude>**/*Test.class</exclude> + </excludes> + </webResource> + <webResource> + <targetPath>WEB-INF</targetPath> + <directory>${basedir}/src/test/resources/WEB-INF/wsaandwsse/</directory> + <includes> + <include>**/*.*</include> + </includes> + </webResource> + </webResources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>unit-tests</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <excludes> + <exclude>**/integration/**/*Test.java</exclude> + <exclude>**/*StressTest.java</exclude> + <exclude>**/*$*.java</exclude> + </excludes> + </configuration> + </execution> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <excludes> + <exclude>**/*StressTest.java</exclude> + <exclude>**/*$*.java</exclude> + </excludes> + <includes> + <include>**/*Integration*Test.java</include> + </includes> + <systemProperties> + <property> + <name>log4j.configuration</name> + <value>integration-test-log4j.xml</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>package</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + <header>JBoss Wise API</header> + <footer>JBoss Wise API</footer> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + + <profiles> + <profile> + <id>skip.tests</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAANDWSSEIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaandwsse; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import junit.framework.Assert; + +import org.jboss.wise.core.client.InvocationResult; +import org.jboss.wise.core.client.WSDynamicClient; +import org.jboss.wise.core.client.WSMethod; +import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; +import org.jboss.wise.core.client.factories.WSDynamicClientFactory; +import org.jboss.wise.core.handlers.LoggingHandler; +import org.jboss.wise.core.test.WiseTest; +import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler; +import org.jboss.wise.core.wsextensions.impl.WSSecurityEnabler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class WSAANDWSSEIntegrationTest extends WiseTest { + private URL warUrl = null; + + @Before + public void setUp() throws Exception { + warUrl = this.getClass().getClassLoader().getResource("wsaandwsse.war"); + deployWS(warUrl); + + } + + @Test + public void shouldRunWithoutMK() throws Exception { + URL wsdlURL = new URL(getServerHostAndPort() + "/wsaandwsse/WSAandWSSE?wsdl"); + + WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); + WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true) + .securityConfigUrl("WEB-INF/wsaandwsse/jboss-wsse-client.xml").securityConfigName("Standard WSSecurity Client") + .wsdlURL(wsdlURL.toString()).build(); + + WSMethod method = client.getWSMethod("WSAandWSSEService", "WSAandWSSEImplPort", "echoUserType"); + + method.getEndpoint().addWSExtension(new WSSecurityEnabler(client)); + method.getEndpoint().addWSExtension(new WSAddressingEnabler(client)); + method.getEndpoint().addHandler(new LoggingHandler()); + HashMap<String, Object> requestMap = new HashMap<String, Object>(); + requestMap.put("user", "SpiderMan"); + InvocationResult result = method.invoke(requestMap, null); + System.out.println(result.getMapRequestAndResult(null, null)); + Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); + client.close(); + Assert.assertEquals("Hello WSAddressingAndWSSecurity SpiderMan", results.get("result")); + } + + @After + public void tearDown() throws Exception { + undeployWS(warUrl); + } +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSE.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaandwsse; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebService(name = "WSAandWSSE", targetNamespace = "http://org.jboss/wise/wssecurity") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface WSAandWSSE { + + + /** + * + * @param user + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echoUserType( + @WebParam(name = "user", partName = "user") + String user); + +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/WSAandWSSEImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaandwsse; + +import javax.jws.HandlerChain; +import javax.jws.WebService; +import org.jboss.ws.annotation.EndpointConfig; + +@WebService(endpointInterface = "org.jboss.wise.test.integration.wsaandwsse.WSAandWSSE", targetNamespace = "http://org.jboss/wise/wssecurity", serviceName = "WSAandWSSEService") +@EndpointConfig(configName = "Standard WSSecurity Endpoint") +@HandlerChain(file = "handlers.xml") +public class WSAandWSSEImpl implements WSAandWSSE { + public String echoUserType(String user) { + return "Hello WSAddressingAndWSSecurity " + user; + } +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaandwsse/handlers.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>WSAddressing Handler</handler-name> + <handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/Hello.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaddressing; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 23-Dic-2008 + * + */ +@WebService( name = "Hello", targetNamespace = "http://org.jboss/wise/wsaddressing" ) +@SOAPBinding( style = SOAPBinding.Style.RPC ) +public interface Hello { + + @WebMethod + @WebResult( partName = "return" ) + public String echoUserType( @WebParam( name = "user", partName = "user" ) + String user ); + +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/HelloImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaddressing; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import org.jboss.ws.annotation.EndpointConfig; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 23-Dic-2008 + * + */ + +@WebService( endpointInterface = "org.jboss.wise.test.integration.wsaddressing.Hello", targetNamespace = "http://org.jboss/wise/wsa", serviceName = "HelloService" ) +@EndpointConfig( configName = "Standard WSAddressing Endpoint" ) +@Stateless +public class HelloImpl implements Hello { + + public String echoUserType( String user ) { + return "Hello WSAddressing"; + } +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsaddressing/WSAddressingIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsaddressing; + +import java.net.URL; +import java.util.Map; + +import junit.framework.Assert; + +import org.jboss.wise.core.client.InvocationResult; +import org.jboss.wise.core.client.WSDynamicClient; +import org.jboss.wise.core.client.WSEndpoint; +import org.jboss.wise.core.client.WSMethod; +import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; +import org.jboss.wise.core.client.factories.WSDynamicClientFactory; +import org.jboss.wise.core.handlers.LoggingHandler; +import org.jboss.wise.core.test.WiseTest; +import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests WS-Addressing extension in Wise + * + * @author alessio.soldano(a)jboss.com + * @since 23-Dic-2008 + */ +public class WSAddressingIntegrationTest extends WiseTest { + private URL warUrl = null; + + @Before + public void setUp() throws Exception { + warUrl = this.getClass().getClassLoader().getResource("wsa.war"); + deployWS(warUrl); + } + + @Test + @SuppressWarnings("unchecked") + public void shouldRunWithoutMK() throws Exception { + URL wsdlURL = new URL(getServerHostAndPort() + "/wsa/Hello?wsdl"); + + WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); + WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true).wsdlURL(wsdlURL + .toString()).build(); + WSMethod method = client.getWSMethod("HelloService", "HelloImplPort", "echoUserType"); + WSEndpoint wsEndpoint = method.getEndpoint(); + + wsEndpoint.addWSExtension(new WSAddressingEnabler(client)); + wsEndpoint.addHandler(new LoggingHandler()); + + Map<String, Object> args = new java.util.HashMap<String, Object>(); + args.put("user", "test"); + InvocationResult result = method.invoke(args, null); + Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); + client.close(); + Assert.assertEquals("Hello WSAddressing", results.get("result")); + } + + @After + public void tearDown() throws Exception { + undeployWS(warUrl); + } +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/Hello.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsse; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebService(name = "Hello", targetNamespace = "http://org.jboss/wise/wssecurity") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Hello { + + + /** + * + * @param user + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echoUserType( + @WebParam(name = "user", partName = "user") + String user); + +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/HelloImpl.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsse; + +import javax.jws.WebService; +import org.jboss.ws.annotation.EndpointConfig; +@WebService( endpointInterface = "org.jboss.wise.test.integration.wsse.Hello", targetNamespace = "http://org.jboss/wise/wssecurity", serviceName = "HelloService" ) +@EndpointConfig(configName = "Standard WSSecurity Endpoint") +public class HelloImpl implements Hello { + public String echoUserType(String user) { + return "Hello WSSecurity"; + } +} Added: core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java =================================================================== --- core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java (rev 0) +++ core/trunk/integration-native/src/test/java/org/jboss/wise/test/integration/wsse/WSSEIntegrationTest.java 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source Copyright 2006, JBoss Inc., and + * individual contributors as indicated by the @authors tag. See the + * copyright.txt 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.wise.test.integration.wsse; + +import java.net.URL; +import java.util.Map; + +import junit.framework.Assert; + +import org.jboss.wise.core.client.InvocationResult; +import org.jboss.wise.core.client.WSDynamicClient; +import org.jboss.wise.core.client.WSEndpoint; +import org.jboss.wise.core.client.WSMethod; +import org.jboss.wise.core.client.builder.WSDynamicClientBuilder; +import org.jboss.wise.core.client.factories.WSDynamicClientFactory; +import org.jboss.wise.core.handlers.LoggingHandler; +import org.jboss.wise.core.test.WiseTest; +import org.jboss.wise.core.wsextensions.impl.WSSecurityEnabler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class WSSEIntegrationTest extends WiseTest { + private URL warUrl = null; + + @Before + public void setUp() throws Exception { + warUrl = this.getClass().getClassLoader().getResource("wsse.war"); + deployWS(warUrl); + + } + + @Test + public void shouldRunWithoutMK() throws Exception { + URL wsdlURL = new URL(getServerHostAndPort() + "/wsse/HelloWorld?wsdl"); + + WSDynamicClientBuilder clientBuilder = WSDynamicClientFactory.getJAXWSClientBuilder(); + WSDynamicClient client = clientBuilder.tmpDir("target/temp/wise").verbose(true).keepSource(true) + .securityConfigUrl("WEB-INF/wsaandwsse/jboss-wsse-client.xml").securityConfigName("Standard WSSecurity Client") + .wsdlURL(wsdlURL.toString()).build(); + + WSMethod method = client.getWSMethod("HelloService", "HelloImplPort", "echoUserType"); + WSEndpoint wsEndpoint = method.getEndpoint(); + + wsEndpoint.addHandler(new LoggingHandler()); + + wsEndpoint.addWSExtension(new WSSecurityEnabler(client)); + + Map<String, Object> args = new java.util.HashMap<String, Object>(); + args.put("user", "test"); + InvocationResult result = method.invoke(args, null); + Map<String, Object> results = (Map<String, Object>) result.getMapRequestAndResult(null, null).get("results"); + client.close(); + Assert.assertEquals("Hello WSSecurity", results.get("result")); + } + + @After + public void tearDown() throws Exception { + undeployWS(warUrl); + } +} Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsa/web.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsa/web.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsa/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>Hello</servlet-name> + <servlet-class>org.jboss.wise.test.integration.wsaddressing.HelloImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Hello</servlet-name> + <url-pattern>/Hello</url-pattern> + </servlet-mapping> + +</web-app> + Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-client.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsaandwsse/wsse.keystore</key-store-file> + <key-store-type>jks</key-store-type> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsaandwsse/wsse.truststore</trust-store-file> + <trust-store-type>jks</trust-store-type> + <trust-store-password>jbossws</trust-store-password> + <config> + + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/jboss-wsse-server.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/web.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/web.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>WSAandWSSE</servlet-name> + <servlet-class>org.jboss.wise.test.integration.wsaandwsse.WSAandWSSEImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>WSAandWSSE</servlet-name> + <url-pattern>/WSAandWSSE</url-pattern> + </servlet-mapping> + +</web-app> + Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore =================================================================== (Binary files differ) Property changes on: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore =================================================================== (Binary files differ) Property changes on: core/trunk/integration-native/src/test/resources/WEB-INF/wsaandwsse/wsse.truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-client.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse/wsse.keystore</key-store-file> + <key-store-type>jks</key-store-type> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse/wsse.truststore</trust-store-file> + <trust-store-type>jks</trust-store-type> + <trust-store-password>jbossws</trust-store-password> + <config> + + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsse/jboss-wsse-server.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/web.xml =================================================================== --- core/trunk/integration-native/src/test/resources/WEB-INF/wsse/web.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/WEB-INF/wsse/web.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>HelloWorld</servlet-name> + <servlet-class>org.jboss.wise.test.integration.wsse.HelloImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>HelloWorld</servlet-name> + <url-pattern>/HelloWorld</url-pattern> + </servlet-mapping> + +</web-app> + Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.keystore =================================================================== (Binary files differ) Property changes on: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.truststore =================================================================== (Binary files differ) Property changes on: core/trunk/integration-native/src/test/resources/WEB-INF/wsse/wsse.truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/integration-native/src/test/resources/integration-test-log4j.xml =================================================================== --- core/trunk/integration-native/src/test/resources/integration-test-log4j.xml (rev 0) +++ core/trunk/integration-native/src/test/resources/integration-test-log4j.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" +debug="false"> + + <appender name="FILE" class="org.apache.log4j.FileAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="File" value="target/integration-test.log"/> + <param name="Append" value="false"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + + <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n + <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> + --> + </layout> + </appender> + <category name="org.jboss.wise"> + <priority value="DEBUG"/> + </category> + <root> + <priority value="INFO"/> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Added: core/trunk/integration-native/src/test/resources/jndi.properties =================================================================== --- core/trunk/integration-native/src/test/resources/jndi.properties (rev 0) +++ core/trunk/integration-native/src/test/resources/jndi.properties 2010-09-09 17:48:04 UTC (rev 398) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:1099 +java.naming.factory.url.pkgs=org.jboss.naming +java.naming.factory.url.pkgs=org.jnp.interfaces + Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2010-09-08 08:45:39 UTC (rev 397) +++ core/trunk/pom.xml 2010-09-09 17:48:04 UTC (rev 398) @@ -540,6 +540,7 @@ </activation> <modules> <module>core-native</module> + <module>integration-native</module> </modules> <dependencies> <dependency>