September 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18955 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/cxf/jbws3792 and 31 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-09-30 08:30:10 -0400 (Tue, 30 Sep 2014) New Revision: 18955 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloRequest.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWSImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWsImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWsImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWsImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWsImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWs.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWsImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl Log: [JBWS-3792] tests to confirm that wsdl:import is handled properly and to demonstrate valid examples. Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloRequest.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloRequest.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloRequest.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,38 @@ +/* + * 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.jbws3792; + +public class HelloRequest +{ + private String input; + + public String getInput() + { + return input; + } + + public void setInput(String input) + { + this.input = input; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloResponse.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,41 @@ +/* + * 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.jbws3792; + +import java.util.ArrayList; +import java.util.List; + +public class HelloResponse +{ + private List<String> multiHello = new ArrayList<String>(); + + public List<String> getMultiHello() + { + return multiHello; + } + + public void setMultiHello(List<String> multiHello) + { + this.multiHello = multiHello; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWSImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWSImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWSImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,42 @@ +/* + * 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.jbws3792; + +import javax.jws.WebService; + +@WebService(wsdlLocation = "WEB-INF/wsdl/Hello.wsdl", + name = HelloWs.NAME, + serviceName = HelloWs.NAME, + targetNamespace = HelloWs.TARGET_NAMESPACE, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs") +public class HelloWSImpl implements HelloWs +{ + + public HelloResponse doHello(HelloRequest request) + { + HelloResponse response = new HelloResponse(); + response.getMultiHello().add(request.getInput()); + response.getMultiHello().add("world"); + return response; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/HelloWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,33 @@ +/* + * 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.jbws3792; +import javax.jws.WebService; + +@WebService(name = HelloWs.NAME, targetNamespace = HelloWs.TARGET_NAMESPACE) +public interface HelloWs +{ + public final static String NAME = "HelloService"; + + public final static String TARGET_NAMESPACE = "http://hello/test"; + + public HelloResponse doHello(HelloRequest request); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,36 @@ +/* + * 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.jbws3792.wsdlImportAlpha; + +import javax.jws.WebService; + +/** + * + */ +@WebService(name = GreetingsWs.NAME, targetNamespace = GreetingsWs.TARGET_NAMESPACE) +public interface GreetingsWs +{ + public final static String NAME = "GreetingsService"; + + public final static String TARGET_NAMESPACE = "http://greetings/test"; +} + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWsImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWsImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/GreetingsWsImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,33 @@ +/* + * 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.jbws3792.wsdlImportAlpha; + +import javax.jws.WebService; + +@WebService( + wsdlLocation = "WEB-INF/wsdl/Greeting_Simplest.wsdl", + targetNamespace = GreetingsWs.TARGET_NAMESPACE, + name = GreetingsWs.NAME, + serviceName = GreetingsWs.NAME, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWs") +public class GreetingsWsImpl implements GreetingsWs { +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportAlpha/JWBS3792AlphaTestCase.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,92 @@ +/* + * 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.jbws3792.wsdlImportAlpha; + +import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.File; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +/** + * Test standard configuration, where all wsdls and schema files are + * located in the same directory. + */ +public class JWBS3792AlphaTestCase extends JBossWSTest { + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportAlpha.war") { + { archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportAlpha.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl"), + "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl"), + "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd"), + "wsdl/Hello_schema2.xsd") + ; + + } + }); + + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(JWBS3792AlphaTestCase.class, + JBossWSTestHelper.writeToFile(createDeployments())); + } + + public void testImportSimplest() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + + ":8080/jbws3792-wsdlImportAlpha/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()){ + cnt++; + QName qn = (QName)it.next(); + assertTrue("qname: " + qn.toString(), + "{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,36 @@ +/* + * 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.jbws3792.wsdlImportBeta; + +import javax.jws.WebService; + +/** + * + */ +@WebService(name = GreetingsWs.NAME, targetNamespace = GreetingsWs.TARGET_NAMESPACE) +public interface GreetingsWs +{ + public final static String NAME = "GreetingsService"; + + public final static String TARGET_NAMESPACE = "http://greetings/test"; +} + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWsImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWsImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/GreetingsWsImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,37 @@ +/* + * 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.jbws3792.wsdlImportBeta; + +import javax.jws.WebService; + +/** + * + */ + +@WebService( + wsdlLocation = "WEB-INF/wsdl/Greeting_Simplest.wsdl", + targetNamespace = GreetingsWs.TARGET_NAMESPACE, + name = GreetingsWs.NAME, + serviceName = GreetingsWs.NAME, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWs") +public class GreetingsWsImpl implements GreetingsWs { +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportBeta/JWBS3792BetaTestCase.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,92 @@ +/* + * 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.jbws3792.wsdlImportBeta; + +import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.File; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +/** + * Test the schema is NOT co-located with the referencing imported wsdl. + * The imported wsdl and the importing wsdl are located in the same directory. + */ +public class JWBS3792BetaTestCase extends JBossWSTest { + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportBeta.war") { + { archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportBeta.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), + "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl"), + "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), + "wsdl/A/b/Hello_schema2.xsd") + ; + + } + }); + + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(JWBS3792BetaTestCase.class, + JBossWSTestHelper.writeToFile(createDeployments())); + } + + + public void testImportSimplest() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + + ":8080/jbws3792-wsdlImportBeta/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()){ + cnt++; + QName qn = (QName)it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,36 @@ +/* + * 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.jbws3792.wsdlImportDelta; + +import javax.jws.WebService; + +/** + * + */ +@WebService(name = GreetingsWs.NAME, targetNamespace = GreetingsWs.TARGET_NAMESPACE) +public interface GreetingsWs +{ + public final static String NAME = "GreetingsService"; + + public final static String TARGET_NAMESPACE = "http://greetings/test"; +} + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWsImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWsImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/GreetingsWsImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,37 @@ +/* + * 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.jbws3792.wsdlImportDelta; + +import javax.jws.WebService; + +/** + * + */ + +@WebService( + wsdlLocation = "WEB-INF/wsdl/Greeting_Simplest.wsdl", + targetNamespace = GreetingsWs.TARGET_NAMESPACE, + name = GreetingsWs.NAME, + serviceName = GreetingsWs.NAME, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWs") +public class GreetingsWsImpl implements GreetingsWs { +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportDelta/JWBS3792DeltaTestCase.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,93 @@ +/* + * 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.jbws3792.wsdlImportDelta; + +import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.File; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +/** + * Test imported wsdl is NOT co-located with the importing wsdl + * and schema is NOT co-located with the referencing imported wsdl. + */ +public class JWBS3792DeltaTestCase extends JBossWSTest { + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportDelta.war") { + { archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportDelta.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl"), + "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl"), + "wsdl/A/b/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd"), + "schema/Hello_schema2.xsd") + ; + + } + }); + + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(JWBS3792DeltaTestCase.class, + JBossWSTestHelper.writeToFile(createDeployments())); + } + + + public void testImportSimplest() throws Exception { + + URL wsdlURL = new URL("http://" + getServerHost() + + ":8080/jbws3792-wsdlImportDelta/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()){ + cnt++; + QName qn = (QName)it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,36 @@ +/* + * 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.jbws3792.wsdlImportEpsilon; + +import javax.jws.WebService; + +/** + * + */ +@WebService(name = GreetingsWs.NAME, targetNamespace = GreetingsWs.TARGET_NAMESPACE) +public interface GreetingsWs +{ + public final static String NAME = "GreetingsService"; + + public final static String TARGET_NAMESPACE = "http://greetings/test"; +} + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWsImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWsImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/GreetingsWsImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,37 @@ +/* + * 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.jbws3792.wsdlImportEpsilon; + +import javax.jws.WebService; + +/** + * + */ + +@WebService( + wsdlLocation = "WEB-INF/wsdl/Greeting_Simplest.wsdl", + targetNamespace = GreetingsWs.TARGET_NAMESPACE, + name = GreetingsWs.NAME, + serviceName = GreetingsWs.NAME, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWs") +public class GreetingsWsImpl implements GreetingsWs { +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportEpsilon/JWBS3792EpsilonTestCase.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,103 @@ +/* + * 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.jbws3792.wsdlImportEpsilon; + +import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse; +import org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.File; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; + +/** + * Test imported wsdl identified by URL of deployed app. + */ +public class JWBS3792EpsilonTestCase extends JBossWSTest { + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-hello.war") { + { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.HelloWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl"), + "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd"), + "wsdl/Hello_schema2.xsd") + ; + } + }); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportEpsilon.war") { + { archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportEpsilon.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl"), + "wsdl/Greeting_Simplest.wsdl") + ; + } + }); + + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(JWBS3792EpsilonTestCase.class, + JBossWSTestHelper.writeToFile(createDeployments())); + } + + + public void testImportSimplest() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + + ":8080/jbws3792-wsdlImportEpsilon/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + HelloWs hello = (HelloWs)service.getPort(HelloWs.class); + HelloRequest hReq = new HelloRequest(); + hReq.setInput("Joe"); + HelloResponse hRep = hello.doHello(hReq); + assertEquals("Joe", hRep.getMultiHello().get(0)); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWs.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWs.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWs.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,36 @@ +/* + * 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.jbws3792.wsdlImportGamma; + +import javax.jws.WebService; + +/** + * + */ +@WebService(name = GreetingsWs.NAME, targetNamespace = GreetingsWs.TARGET_NAMESPACE) +public interface GreetingsWs +{ + public final static String NAME = "GreetingsService"; + + public final static String TARGET_NAMESPACE = "http://greetings/test"; +} + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWsImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWsImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/GreetingsWsImpl.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,37 @@ +/* + * 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.jbws3792.wsdlImportGamma; + +import javax.jws.WebService; + +/** + * + */ + +@WebService( + wsdlLocation = "WEB-INF/wsdl/Greeting_Simplest.wsdl", + targetNamespace = GreetingsWs.TARGET_NAMESPACE, + name = GreetingsWs.NAME, + serviceName = GreetingsWs.NAME, + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWs") +public class GreetingsWsImpl implements GreetingsWs { +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsdlImportGamma/JWBS3792GammaTestCase.java 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,91 @@ +/* + * 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.jbws3792.wsdlImportGamma; + +import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.File; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +/** + * Test imported wsdl and its referenced schema is NOT co-located with the + * importing wsdl. The imported wsdl and its referenced schema are located + * in the same directory as the importing wsdl. + */ +public class JWBS3792GammaTestCase extends JBossWSTest { + + public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments () { + List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>(); + + list.add( + new JBossWSTestHelper.WarDeployment("jbws3792-wsdlImportGamma.war") { + { archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWsImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsdlImportGamma.GreetingsWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl"), + "wsdl/Greeting_Simplest.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl"), "wsdl/A/b/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd"), "wsdl/A/b/Hello_schema2.xsd") + ; + + } + }); + + return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]); + } + + public static Test suite() + { + return new JBossWSTestSetup(JWBS3792GammaTestCase.class, + JBossWSTestHelper.writeToFile(createDeployments())); + } + + + public void testImportSimplest() throws Exception { + URL wsdlURL = new URL("http://" + getServerHost() + + ":8080/jbws3792-wsdlImportGamma/GreetingsService?wsdl"); + QName qname = new QName("http://hello/test", "HelloService"); + Service service = Service.create(wsdlURL, qname); + Iterator<QName> it = service.getPorts(); + int cnt = 0; + while (it.hasNext()){ + cnt++; + QName qn = (QName)it.next(); + assertTrue("{http://hello/test}HelloServicePort".equals(qn.toString())); + } + assertTrue("Expected cnt to be 1 but cnt is " + cnt, cnt == 1); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" + targetNamespace="http://hello/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://hello/test" + xmlns:tns2="http://hello/test2" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test2" schemaLocation="Hello_schema2.xsd"/> + </schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns2:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns2:doHelloResponse"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:8080/HelloServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello_schema2.xsd 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns="http://hello/test2" + xmlns:tns="http://hello/test2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" + targetNamespace="http://hello/test2" + version="1.0"> + + <xs:element name="doHello" type="tns:doHello"/> + <xs:element name="doHelloResponse" type="tns:doHelloResponse"/> + <xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions + targetNamespace="http://greetings/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://greetings/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + > + + <wsdl:import namespace="http://hello/test" + location="Hello.wsdl" /> + + <wsdl:portType name="GreetingsService"> + </wsdl:portType> + + <wsdl:binding name="GreetingsServiceSoapBinding" type="tns:GreetingsService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + </wsdl:binding> + + <wsdl:service name="GreetingsService"> + <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> + <soap:address location="http://localhost:8080/GreetingsServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" + targetNamespace="http://hello/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://hello/test" + xmlns:tns2="http://hello/test2" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test2" schemaLocation="Hello_schema2.xsd"/> + </schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns2:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns2:doHelloResponse"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:8080/HelloServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello_schema2.xsd 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns="http://hello/test2" + xmlns:tns="http://hello/test2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" + targetNamespace="http://hello/test2" + version="1.0"> + + <xs:element name="doHello" type="tns:doHello"/> + <xs:element name="doHelloResponse" type="tns:doHelloResponse"/> + <xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/A/b/Hello_schema2.xsd 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns="http://hello/test2" + xmlns:tns="http://hello/test2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" + targetNamespace="http://hello/test2" + version="1.0"> + + <xs:element name="doHello" type="tns:doHello"/> + <xs:element name="doHelloResponse" type="tns:doHelloResponse"/> + <xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions + targetNamespace="http://greetings/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://greetings/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + > + + <wsdl:import namespace="http://hello/test" + location="Hello.wsdl" /> + + <wsdl:portType name="GreetingsService"> + </wsdl:portType> + + <wsdl:binding name="GreetingsServiceSoapBinding" type="tns:GreetingsService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + </wsdl:binding> + + <wsdl:service name="GreetingsService"> + <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> + <soap:address location="http://localhost:8080/GreetingsServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" + targetNamespace="http://hello/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://hello/test" + xmlns:tns2="http://hello/test2" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test2" schemaLocation="A/b/Hello_schema2.xsd"/> + </schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns2:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns2:doHelloResponse"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:8080/HelloServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/schema/Hello_schema2.xsd 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns="http://hello/test2" + xmlns:tns="http://hello/test2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" + targetNamespace="http://hello/test2" + version="1.0"> + + <xs:element name="doHello" type="tns:doHello"/> + <xs:element name="doHelloResponse" type="tns:doHelloResponse"/> + <xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" + targetNamespace="http://hello/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://hello/test" + xmlns:tns2="http://hello/test2" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test2" schemaLocation="../../../schema/Hello_schema2.xsd"/> + </schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns2:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns2:doHelloResponse"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:8080/HelloServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions + targetNamespace="http://greetings/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://greetings/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + > + + <wsdl:import namespace="http://hello/test" location="A/b/Hello.wsdl" /> + + <wsdl:portType name="GreetingsService"> + </wsdl:portType> + + <wsdl:binding name="GreetingsServiceSoapBinding" type="tns:GreetingsService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + </wsdl:binding> + + <wsdl:service name="GreetingsService"> + <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> + <soap:address location="http://localhost:8080/GreetingsServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions + targetNamespace="http://greetings/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://greetings/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + > + <wsdl:import namespace="http://hello/test" + location="http://localhost:8080/jbws3792-hello/HelloService?wsdl" /> + + <wsdl:portType name="GreetingsService"> + </wsdl:portType> + + <wsdl:binding name="GreetingsServiceSoapBinding" type="tns:GreetingsService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + </wsdl:binding> + + <wsdl:service name="GreetingsService"> + <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> + <soap:address location="http://localhost:8080/GreetingsServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" + targetNamespace="http://hello/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://hello/test" + xmlns:tns2="http://hello/test2" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"> + <import namespace="http://hello/test2" schemaLocation="Hello_schema2.xsd"/> + </schema> + </wsdl:types> + <wsdl:message name="doHello"> + <wsdl:part name="parameters" element="tns2:doHello"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="doHelloResponse"> + <wsdl:part name="parameters" element="tns2:doHelloResponse"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="HelloService"> + <wsdl:operation name="doHello"> + <wsdl:input name="doHello" message="tns:doHello"> + </wsdl:input> + <wsdl:output name="doHelloResponse" message="tns:doHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloServiceSoapBinding" type="tns:HelloService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="doHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="doHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="doHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="HelloService"> + <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:8080/HelloServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello_schema2.xsd 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns="http://hello/test2" + xmlns:tns="http://hello/test2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" + targetNamespace="http://hello/test2" + version="1.0"> + + <xs:element name="doHello" type="tns:doHello"/> + <xs:element name="doHelloResponse" type="tns:doHelloResponse"/> + <xs:complexType name="doHello"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="tns:helloRequest"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloRequest"> + <xs:sequence> + <xs:element minOccurs="0" name="hello" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doHelloResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="tns:helloResponse"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="multiHello" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl 2014-09-30 12:30:10 UTC (rev 18955) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions + targetNamespace="http://greetings/test" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://greetings/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + > + + <wsdl:import namespace="http://hello/test" + location="A/b/Hello.wsdl" /> + + <wsdl:portType name="GreetingsService"> + </wsdl:portType> + + <wsdl:binding name="GreetingsServiceSoapBinding" type="tns:GreetingsService"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + </wsdl:binding> + + <wsdl:service name="GreetingsService"> + <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> + <soap:address location="http://localhost:8080/GreetingsServicePort"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> +

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18954 - in container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices: deployers and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-29 05:37:28 -0400 (Mon, 29 Sep 2014) New Revision: 18954 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java Log: Backport [WFLY-3535] check Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2014-09-29 09:37:03 UTC (rev 18953) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2014-09-29 09:37:28 UTC (rev 18954) @@ -300,4 +300,7 @@ + WS_SPEC_REF_5_3_2_4_2) void finalizeMethodNotAllowed(Class<?> seiClass); + @LogMessage(level = WARN) + @Message(id = 15617, value = "Annotation '@%s' found on class '%s'. Perhaps you forgot to add a '%s' module dependency to your deployment?") + void missingModuleDependency(String annotation, String clazz, String module); } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java 2014-09-29 09:37:03 UTC (rev 18953) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java 2014-09-29 09:37:28 UTC (rev 18954) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2013, Red Hat, Inc., and individual contributors + * Copyright 2014, Red Hat, Inc., and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -24,6 +24,8 @@ import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.WSMessages.MESSAGES; +import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION; +import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_PROVIDER_ANNOTATION; import static org.jboss.as.webservices.util.WSAttachmentKeys.JAXWS_ENDPOINTS_KEY; import javax.jws.WebService; @@ -33,14 +35,23 @@ import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.server.deployment.annotation.CompositeIndex; +import org.jboss.as.server.deployment.module.ModuleDependency; +import org.jboss.as.server.deployment.module.ModuleSpecification; import org.jboss.as.server.deployment.reflect.DeploymentReflectionIndex; +import org.jboss.as.webservices.WSLogger; import org.jboss.as.webservices.metadata.model.AbstractEndpoint; import org.jboss.as.webservices.metadata.model.JAXWSDeployment; import org.jboss.as.webservices.verification.JwsWebServiceEndpointVerifier; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; import org.jboss.modules.Module; /** * @author sfcoy + * @autor <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> * */ public class WSClassVerificationProcessor implements DeploymentUnitProcessor { @@ -60,6 +71,7 @@ for (AbstractEndpoint ejbEndpoint : wsDeployment.getEjbEndpoints()) { verifyEndpoint(ejbEndpoint, moduleClassLoader, deploymentReflectionIndex); } + verifyApacheCXFModuleDependencyRequirement(unit); } } @@ -94,7 +106,44 @@ throw MESSAGES.declaredEndpointInterfaceClassNotFound(endpointInterfaceClassName, endpointClass); } } + + private void verifyApacheCXFModuleDependencyRequirement(DeploymentUnit unit) { + if (!hasCxfModuleDependency(unit)) { + // notify user if he clearly forgot the CXF module dependency + final CompositeIndex index = unit + .getAttachment(Attachments.COMPOSITE_ANNOTATION_INDEX); + final DotName[] dotNames = { WEB_SERVICE_ANNOTATION, + WEB_SERVICE_PROVIDER_ANNOTATION }; + for (final DotName dotName : dotNames) { + for (AnnotationInstance ai : index.getAnnotations(dotName)) { + AnnotationTarget at = ai.target(); + if (at instanceof ClassInfo) { + final ClassInfo clazz = (ClassInfo) ai.target(); + for (DotName dn : clazz.annotations().keySet()) { + if (dn.toString().startsWith("org.apache.cxf")) { + WSLogger.ROOT_LOGGER.missingModuleDependency( + dn.toString(), clazz.name().toString(), + "org.apache.cxf"); + } + } + } + } + } + } + } + private static boolean hasCxfModuleDependency(DeploymentUnit unit) { + final ModuleSpecification moduleSpec = unit + .getAttachment(Attachments.MODULE_SPECIFICATION); + for (ModuleDependency dep : moduleSpec.getUserDependencies()) { + final String id = dep.getIdentifier().getName(); + if ("org.apache.cxf".equals(id) || "org.apache.cxf.impl".equals(id)) { + return true; + } + } + return false; + } + @Override public void undeploy(DeploymentUnit context) { }

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18953 - container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-29 05:37:03 -0400 (Mon, 29 Sep 2014) New Revision: 18953 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java Log: Backporting [WFLY-3905] Only execute POJO processor on WAR deployments Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-09-29 09:22:03 UTC (rev 18952) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-09-29 09:37:03 UTC (rev 18953) @@ -35,6 +35,8 @@ import java.util.List; import org.jboss.as.ee.component.ComponentDescription; +import org.jboss.as.ee.structure.DeploymentType; +import org.jboss.as.ee.structure.DeploymentTypeMarker; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.annotation.CompositeIndex; @@ -62,6 +64,9 @@ @Override protected void processAnnotation(final DeploymentUnit unit, final ClassInfo classInfo, final AnnotationInstance wsAnnotation, final CompositeIndex compositeIndex) throws DeploymentUnitProcessingException { + if (!DeploymentTypeMarker.isType(DeploymentType.WAR, unit)) { + return; + } if (isEjb3(classInfo)) { // Don't create component description for EJB3 endpoints. // There's already one created by EJB3 subsystem.

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18952 - in container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices: deployers and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-29 05:22:03 -0400 (Mon, 29 Sep 2014) New Revision: 18952 Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java Log: Backport [WFLY-3535] check Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2014-09-29 09:17:59 UTC (rev 18951) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2014-09-29 09:22:03 UTC (rev 18952) @@ -300,4 +300,7 @@ + WS_SPEC_REF_5_3_2_4_2) void finalizeMethodNotAllowed(Class<?> seiClass); + @LogMessage(level = WARN) + @Message(id = 15617, value = "Annotation '@%s' found on class '%s'. Perhaps you forgot to add a '%s' module dependency to your deployment?") + void missingModuleDependency(String annotation, String clazz, String module); } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java 2014-09-29 09:17:59 UTC (rev 18951) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSClassVerificationProcessor.java 2014-09-29 09:22:03 UTC (rev 18952) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2013, Red Hat, Inc., and individual contributors + * Copyright 2014, Red Hat, Inc., and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -25,6 +25,8 @@ import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.WSMessages.MESSAGES; import static org.jboss.as.webservices.util.WSAttachmentKeys.JAXWS_ENDPOINTS_KEY; +import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION; +import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_PROVIDER_ANNOTATION; import javax.jws.WebService; @@ -33,14 +35,23 @@ import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.server.deployment.annotation.CompositeIndex; +import org.jboss.as.server.deployment.module.ModuleDependency; +import org.jboss.as.server.deployment.module.ModuleSpecification; import org.jboss.as.server.deployment.reflect.DeploymentReflectionIndex; +import org.jboss.as.webservices.WSLogger; import org.jboss.as.webservices.metadata.model.AbstractEndpoint; import org.jboss.as.webservices.metadata.model.JAXWSDeployment; import org.jboss.as.webservices.verification.JwsWebServiceEndpointVerifier; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; import org.jboss.modules.Module; /** * @author sfcoy + * @autor <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> * */ public class WSClassVerificationProcessor implements DeploymentUnitProcessor { @@ -60,6 +71,7 @@ for (AbstractEndpoint ejbEndpoint : wsDeployment.getEjbEndpoints()) { verifyEndpoint(ejbEndpoint, moduleClassLoader, deploymentReflectionIndex); } + verifyApacheCXFModuleDependencyRequirement(unit); } } @@ -94,7 +106,44 @@ throw MESSAGES.declaredEndpointInterfaceClassNotFound(endpointInterfaceClassName, endpointClass); } } + + private void verifyApacheCXFModuleDependencyRequirement(DeploymentUnit unit) { + if (!hasCxfModuleDependency(unit)) { + // notify user if he clearly forgot the CXF module dependency + final CompositeIndex index = unit + .getAttachment(Attachments.COMPOSITE_ANNOTATION_INDEX); + final DotName[] dotNames = { WEB_SERVICE_ANNOTATION, + WEB_SERVICE_PROVIDER_ANNOTATION }; + for (final DotName dotName : dotNames) { + for (AnnotationInstance ai : index.getAnnotations(dotName)) { + AnnotationTarget at = ai.target(); + if (at instanceof ClassInfo) { + final ClassInfo clazz = (ClassInfo) ai.target(); + for (DotName dn : clazz.annotations().keySet()) { + if (dn.toString().startsWith("org.apache.cxf")) { + WSLogger.ROOT_LOGGER.missingModuleDependency( + dn.toString(), clazz.name().toString(), + "org.apache.cxf"); + } + } + } + } + } + } + } + private static boolean hasCxfModuleDependency(DeploymentUnit unit) { + final ModuleSpecification moduleSpec = unit + .getAttachment(Attachments.MODULE_SPECIFICATION); + for (ModuleDependency dep : moduleSpec.getUserDependencies()) { + final String id = dep.getIdentifier().getName(); + if ("org.apache.cxf".equals(id) || "org.apache.cxf.impl".equals(id)) { + return true; + } + } + return false; + } + @Override public void undeploy(DeploymentUnit context) { }

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18951 - container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-29 05:17:59 -0400 (Mon, 29 Sep 2014) New Revision: 18951 Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java Log: Backporting [WFLY-3905] Only execute POJO processor on WAR deployments Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-09-26 13:51:20 UTC (rev 18950) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_POJO.java 2014-09-29 09:17:59 UTC (rev 18951) @@ -77,6 +77,9 @@ // @Override protected void processAnnotation(final DeploymentUnit unit, final EEModuleDescription moduleDescription) throws DeploymentUnitProcessingException { + if (!DeploymentTypeMarker.isType(DeploymentType.WAR, unit)) { + return; + } final Map<String, EEModuleClassDescription> classDescriptionMap = new HashMap<String, EEModuleClassDescription>(); final CompositeIndex index = unit.getAttachment(Attachments.COMPOSITE_ANNOTATION_INDEX); for (EEModuleClassDescription classDescritpion : moduleDescription.getClassDescriptions()) {

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18950 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-26 09:51:20 -0400 (Fri, 26 Sep 2014) New Revision: 18950 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java Log: Improving exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-09-26 07:47:38 UTC (rev 18949) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-09-26 13:51:20 UTC (rev 18950) @@ -113,6 +113,7 @@ try { port.echo("foo"); + fail("Exception expected"); } catch (Exception e) { assertTrue(e.getMessage().contains("None of the policy alternatives can be satisfied")); }

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18949 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-26 03:47:38 -0400 (Fri, 26 Sep 2014) New Revision: 18949 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java Log: [JBWS-3833] Enriching testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2014-09-24 08:51:44 UTC (rev 18948) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynch/AsynchTestCase.java 2014-09-26 07:47:38 UTC (rev 18949) @@ -67,6 +67,16 @@ { return new JBossWSCXFTestSetup(AsynchTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } + + public void testEndpoint() throws Exception + { + QName serviceName = new QName("http://org.jboss.ws/cxf/samples/asynch", "EndpointImplService"); + URL wsdlURL = new URL(endpointAddress + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + Endpoint proxy = service.getPort(Endpoint.class); + final String user = "Kermit"; + assertEquals(user + " (ASYNC)", proxy.echo(user)); //expect ASYNC as on server side the invocation is dispatched to the async method + } public void testAsyncEndpoint() throws Exception {

9 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-24 04:51:44 -0400 (Wed, 24 Sep 2014) New Revision: 18948 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3831] Removing exclude Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-09-24 08:50:43 UTC (rev 18947) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-09-24 08:51:44 UTC (rev 18948) @@ -856,9 +856,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase*</exclude> </excludes> </configuration> </plugin>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18947 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-24 04:50:43 -0400 (Wed, 24 Sep 2014) New Revision: 18947 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java Log: [JBWS-3831] Use custom SAML validator Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java 2014-09-23 13:20:29 UTC (rev 18946) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/DeploymentArchives.java 2014-09-24 08:50:43 UTC (rev 18947) @@ -93,6 +93,7 @@ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2323Impl.class) .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.Service2324Impl.class) .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.jks"), "classes/bob.jks") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties"), "classes/bob.properties") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl"), "wsdl/SecurityService23x.wsdl") Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java 2014-09-24 08:50:43 UTC (rev 18947) @@ -0,0 +1,9 @@ +package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis; + +public class SAMLValidator extends org.apache.wss4j.dom.validate.SamlAssertionValidator +{ + public SAMLValidator() { + super(); + setRequireBearerSignature(false); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-09-23 13:20:29 UTC (rev 18946) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-09-24 08:50:43 UTC (rev 18947) @@ -24,6 +24,8 @@ import javax.ejb.Stateless; import javax.jws.WebService; +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; import org.jboss.ws.api.annotation.WebContext; @WebService @@ -35,6 +37,10 @@ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" ) @Stateless +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.saml1.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator") + } +) @WebContext(urlPattern = "SecurityService2311") public class Service2311Impl implements ServiceIface { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-09-23 13:20:29 UTC (rev 18946) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-09-24 08:50:43 UTC (rev 18947) @@ -41,6 +41,7 @@ @EndpointProperty(key = "ws-security.signature.username", value = "bob"), @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.saml2.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator"), @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") } )

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18946 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-23 09:20:29 -0400 (Tue, 23 Sep 2014) New Revision: 18946 Modified: stack/cxf/trunk/pom.xml Log: Moving to latest wfly snapshot Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-09-23 12:00:27 UTC (rev 18945) +++ stack/cxf/trunk/pom.xml 2014-09-23 13:20:29 UTC (rev 18946) @@ -69,7 +69,7 @@ <jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version> <wildfly800.version>8.0.0.Final</wildfly800.version> <wildfly810.version>8.1.0.Final</wildfly810.version> - <wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version> + <wildfly900.version>9.0.0.Alpha2-SNAPSHOT</wildfly900.version> <ejb.api.version>1.0.2.Final</ejb.api.version> <cxf.version>3.0.2-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version>

9 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2014