JBossWS SVN: r18992 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-10-16 09:25:22 -0400 (Thu, 16 Oct 2014)
New Revision: 18992
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/externalWsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/externalWsdl/JBWS3792WS.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/Hello.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/HelloResponse.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WS.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSService.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3792] test for accessing external wsdl via URL defined in wsdlLocation property of WebService.
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/externalWsdl/JBWS3792WS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/externalWsdl/JBWS3792WS.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/externalWsdl/JBWS3792WS.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,29 @@
+/*
+ * 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.externalWsdl;
+
+import javax.jws.WebService;
+
+@WebService
+public interface JBWS3792WS {
+ String hello();
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/Hello.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/Hello.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/Hello.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,35 @@
+/*
+ * 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.wsImpl;
+
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "hello")
+public class Hello {
+
+
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/HelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/HelloResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/HelloResponse.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,49 @@
+/*
+ * 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.wsImpl;
+
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "helloResponse", propOrder = {
+ "_return"
+})
+public class HelloResponse {
+
+ @XmlElement(name = "return")
+ protected String _return;
+
+
+ public String getReturn() {
+ return _return;
+ }
+
+
+ public void setReturn(String value) {
+ this._return = value;
+ }
+
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WS.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WS.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -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.wsImpl;
+
+
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+@WebService(targetNamespace = "http://test.jbws3792/", name = "JBWS3792WS")
+public interface JBWS3792WS {
+
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "hello", targetNamespace = "http://test.jbws3792/",
+ className = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.Hello")
+ @WebMethod
+ @ResponseWrapper(localName = "helloResponse",
+ targetNamespace = "http://test.jbws3792/",
+ className = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.HelloResponse")
+ public java.lang.String hello();
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,49 @@
+/*
+ * 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.wsImpl;
+
+import java.util.logging.Logger;
+
+(a)javax.jws.WebService(
+ serviceName = "JBWS3792WSService",
+ portName = "JBWS3792WSPort",
+ targetNamespace = "http://test.jbws3792/",
+ wsdlLocation = "http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS")
+
+public class JBWS3792WSImpl implements JBWS3792WS {
+
+ private static final Logger LOG = Logger.getLogger(JBWS3792WSImpl.class.getName());
+
+ public java.lang.String hello() {
+ LOG.info("Executing operation hello");
+ try {
+ java.lang.String _return = "Hello world!";
+ return _return;
+ } catch (java.lang.Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSService.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSService.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSService.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -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.wsImpl;
+
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.Service;
+
+
+@WebServiceClient(name = "JBWS3792WSService",
+ wsdlLocation = "http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl",
+ targetNamespace = "http://test.jbws3792/")
+public class JBWS3792WSService extends Service {
+
+ public final static URL WSDL_LOCATION;
+
+ public final static QName SERVICE = new QName("http://test.jbws3792/", "JBWS3792WSService");
+ public final static QName JBWS3792WSPort = new QName("http://test.jbws3792/", "JBWS3792WSPort");
+ static {
+ URL url = null;
+ try {
+ url = new URL("http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl");
+ } catch (MalformedURLException e) {
+ java.util.logging.Logger.getLogger(JBWS3792WSService.class.getName())
+ .log(java.util.logging.Level.INFO,
+ "Can not initialize the default wsdl from {0}", "http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl");
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public JBWS3792WSService(URL wsdlLocation) {
+ super(wsdlLocation, SERVICE);
+ }
+
+ public JBWS3792WSService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public JBWS3792WSService() {
+ super(WSDL_LOCATION, SERVICE);
+ }
+
+ public JBWS3792WSService(WebServiceFeature ... features) {
+ super(WSDL_LOCATION, SERVICE, features);
+ }
+
+ public JBWS3792WSService(URL wsdlLocation, WebServiceFeature ... features) {
+ super(wsdlLocation, SERVICE, features);
+ }
+
+ public JBWS3792WSService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+ super(wsdlLocation, serviceName, features);
+ }
+
+ @WebEndpoint(name = "JBWS3792WSPort")
+ public JBWS3792WS getJBWS3792WSPort() {
+ return super.getPort(JBWS3792WSPort, JBWS3792WS.class);
+ }
+
+
+ @WebEndpoint(name = "JBWS3792WSPort")
+ public JBWS3792WS getJBWS3792WSPort(WebServiceFeature... features) {
+ return super.getPort(JBWS3792WSPort, JBWS3792WS.class, features);
+ }
+
+}
+
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,109 @@
+/*
+ * 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.wsImpl;
+
+import junit.framework.Test;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+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 that a external wsdl declared by a valid URL in a wsdlLocation
+ * property of a WebService annotation is supported.
+ */
+public class JBWS3792WsImplTestCase extends JBossWSTest {
+
+ public static JBossWSTestHelper.BaseDeployment<?>[] createDeployments() {
+ List<JBossWSTestHelper.BaseDeployment<?>> list = new LinkedList<JBossWSTestHelper.BaseDeployment<?>>();
+ list.add(
+
+ new JBossWSTestHelper.WarDeployment("jbws3792-external-wsdl.war") { {
+ archive
+ .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.externalWsdl.JBWS3792WS.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml"), "web.xml")
+ .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl")), ArchivePaths.root().get() + "jbws3792.wsdl")
+ .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl")), "/import.wsdl")
+
+ ;
+ }
+ }
+ );
+ list.add( new JBossWSTestHelper.WarDeployment("jbws3792-ws-impl.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.wsImpl.Hello.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.HelloResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSService.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml"))
+ ;
+ }
+ }
+ );
+ return list.toArray(new JBossWSTestHelper.BaseDeployment<?>[list.size()]);
+ }
+
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3792WsImplTestCase.class,
+ JBossWSTestHelper.writeToFile(createDeployments())
+ );
+ }
+
+
+ public void test() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost()
+ + ":8080/jbws3792-ws-impl/JBWS3792WSService?wsdl");
+ QName qname = new QName("http://test.jbws3792/", "JBWS3792WSService");
+ 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://test.jbws3792/}JBWS3792WSPort".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/externalWsdl/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/web.xml 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+ <module-name>jbws3792-external-wsdl</module-name>
+</web-app>
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/import.wsdl 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="JBWS3792WSService"
+ targetNamespace="http://test.jbws3792/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://test.jbws3792/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:tns="http://test.jbws3792/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="unqualified"
+ targetNamespace="http://test.jbws3792/"
+ version="1.0">
+
+ <xs:element name="hello" type="tns:hello"/>
+
+ <xs:element name="helloResponse" type="tns:helloResponse"/>
+
+ <xs:complexType name="hello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="helloResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="helloResponse">
+ <wsdl:part name="parameters" element="tns:helloResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="hello">
+ <wsdl:part name="parameters" element="tns:hello">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="JBWS3792WS">
+ <wsdl:operation name="hello">
+ <wsdl:input name="hello" message="tns:hello">
+ </wsdl:input>
+ <wsdl:output name="helloResponse" message="tns:helloResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="JBWS3792WSServiceSoapBinding" type="tns:JBWS3792WS">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="hello">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="hello">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="helloResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="JBWS3792WSService">
+ <wsdl:port name="JBWS3792WSPort" binding="tns:JBWS3792WSServiceSoapBinding">
+ <soap:address location="http://localhost:9090/JBWS3792WSPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="JBWS3792WSService"
+ targetNamespace="http://test.jbws3792/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <wsdl:import namespace="http://test.jbws3792/"
+ location="http://localhost:8080/jbws3792-external-wsdl/import.wsdl"/>
+
+</wsdl:definitions>
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml 2014-10-16 13:25:22 UTC (rev 18992)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+ <module-name>jbws3792-ws-impl</module-name>
+</web-app>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-10-16 10:44:29 UTC (rev 18991)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-10-16 13:25:22 UTC (rev 18992)
@@ -691,6 +691,9 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!-- # [jbws-3792] waiting for jbossws-common update -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase*</exclude>
</excludes>
</configuration>
</plugin>
@@ -770,6 +773,10 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!-- # [jbws-3792] waiting for jbossws-common update -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -850,6 +857,10 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!-- # [jbws-3792] waiting for jbossws-common update -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
9 years, 6 months
- 1
- 0
JBossWS SVN: r18991 - in container/jboss72/tags/jbossws-jboss720-4.3.1.Final: server-integration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 06:44:29 -0400 (Thu, 16 Oct 2014)
New Revision: 18991
Modified:
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
Applying fix for allowing restarting resource services upon https connector removal and setting versions for new 4.3.1.Final tag
Modified: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml 2014-10-16 10:44:29 UTC (rev 18991)
@@ -35,13 +35,13 @@
<description>JBossWS JBoss AS 7.2.0.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1.Final</version>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
</scm>
<modules>
Modified: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml 2014-10-16 10:44:29 UTC (rev 18991)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml 2014-10-16 10:44:29 UTC (rev 18991)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.1.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 10:36:45 UTC (rev 18990)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 10:44:29 UTC (rev 18991)
@@ -291,6 +291,7 @@
public void removeHttpsConnector() throws Exception {
try {
ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", REMOVE);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
applyUpdate(op);
} finally {
httpsConnSemaphore.release();
9 years, 6 months
- 1
- 0
JBossWS SVN: r18990 - in container/jboss72/tags: jbossws-jboss720-4.3.1.Final and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 06:36:45 -0400 (Thu, 16 Oct 2014)
New Revision: 18990
Added:
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml
Removed:
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml
Log:
Deleted: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.0.Final/pom.xml 2014-03-14 08:32:28 UTC (rev 18510)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, 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.
- ~
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-parent</artifactId>
- <version>1.1.0.GA</version>
- </parent>
-
- <name>JBossWS JBoss AS 7.2.0.Final Integration Parent</name>
- <description>JBossWS JBoss AS 7.2.0.Final Integration Parent</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.CR2</version>
- <packaging>pom</packaging>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
- </scm>
-
- <modules>
- <module>server-integration</module>
- <module>tests-integration</module>
- </modules>
-
- <properties>
- <jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0.CR1</jbossws.spi.version>
- <jbossws.common.version>2.3.0.CR2</jbossws.common.version>
- <jboss.msc.version>1.0.4.GA</jboss.msc.version>
- <jboss.version>7.2.0.Final</jboss.version>
- <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
- <marshalling.river.version>1.3.16.GA</marshalling.river.version>
- <hornetq.version>2.3.0.CR1</hornetq.version>
- <remoting3.version>3.2.14.GA</remoting3.version>
- <remoting.jmx.version>1.1.0.Final</remoting.jmx.version>
- <jbossxb.version>2.0.3.GA</jbossxb.version>
- <xerces.version>2.9.1-jbossas-2</xerces.version>
- <xnio.version>3.0.7.GA</xnio.version>
- <remote.naming.version>1.0.5.Final</remote.naming.version>
- <javax.mail.version>1.4.5</javax.mail.version>
- <ejb.client.version>1.0.16.Final</ejb.client.version>
- <ejb3.ext.api.version>2.0.0</ejb3.ext.api.version>
- <javassist.version>3.15.0-GA</javassist.version>
- <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
- <jboss.logging.processor.version>1.1.0.Final</jboss.logging.processor.version>
- <junit.version>4.10</junit.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-api</artifactId>
- <version>${jbossws.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.msc</groupId>
- <artifactId>jboss-msc</artifactId>
- <version>${jboss.msc.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <version>${jboss.logging.processor.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-ee</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-web</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>${jboss.jaxws.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- For compiling and using tests submodule to integrate with JBossAS -->
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-controller-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-clustering-infinispan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- <version>${marshalling.river.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-subsystem-test</artifactId>
- <version>${jboss.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- For running tests using tests submodule - see [JBWS-3484] -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-remote-naming</artifactId>
- <version>${remote.naming.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb-client</artifactId>
- <version>${ejb.client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>${ejb3.ext.api.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${jboss.common.core.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${jbossxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.wutka</groupId>
- <artifactId>dtdparser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
- <version>${remoting.jmx.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>${remoting3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-server</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core-client</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-server</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- <version>${xnio.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- <version>${xnio.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
Copied: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml (from rev 18512, container/jboss72/tags/jbossws-jboss720-4.3.0.Final/pom.xml)
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml (rev 0)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, 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.
+ ~
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.1.0.GA</version>
+ </parent>
+
+ <name>JBossWS JBoss AS 7.2.0.Final Integration Parent</name>
+ <description>JBossWS JBoss AS 7.2.0.Final Integration Parent</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss720-parent</artifactId>
+ <version>4.3.0.Final</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
+ </scm>
+
+ <modules>
+ <module>server-integration</module>
+ <module>tests-integration</module>
+ </modules>
+
+ <properties>
+ <jbossws.api.version>1.0.2.Final</jbossws.api.version>
+ <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
+ <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jboss.msc.version>1.0.4.GA</jboss.msc.version>
+ <jboss.version>7.2.0.Final</jboss.version>
+ <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
+ <marshalling.river.version>1.3.16.GA</marshalling.river.version>
+ <hornetq.version>2.3.0.CR1</hornetq.version>
+ <remoting3.version>3.2.14.GA</remoting3.version>
+ <remoting.jmx.version>1.1.0.Final</remoting.jmx.version>
+ <jbossxb.version>2.0.3.GA</jbossxb.version>
+ <xerces.version>2.9.1-jbossas-2</xerces.version>
+ <xnio.version>3.0.7.GA</xnio.version>
+ <remote.naming.version>1.0.5.Final</remote.naming.version>
+ <javax.mail.version>1.4.5</javax.mail.version>
+ <ejb.client.version>1.0.16.Final</ejb.client.version>
+ <ejb3.ext.api.version>2.0.0</ejb3.ext.api.version>
+ <javassist.version>3.15.0-GA</javassist.version>
+ <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
+ <jboss.logging.processor.version>1.1.0.Final</jboss.logging.processor.version>
+ <junit.version>4.10</junit.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ <version>${jbossws.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ <version>${jboss.msc.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <version>${jboss.logging.processor.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${jboss.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ee</artifactId>
+ <version>${jboss.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-web</artifactId>
+ <version>${jboss.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <version>${jboss.jaxws.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- For compiling and using tests submodule to integrate with JBossAS -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-clustering-infinispan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>${marshalling.river.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-subsystem-test</artifactId>
+ <version>${jboss.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- For running tests using tests submodule - see [JBWS-3484] -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ <version>${remote.naming.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax.mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <version>${ejb.client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>${ejb3.ext.api.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${jboss.common.core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.wutka</groupId>
+ <artifactId>dtdparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remotingjmx</groupId>
+ <artifactId>remoting-jmx</artifactId>
+ <version>${remoting.jmx.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>${remoting3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-server</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-server</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>${xnio.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <version>${xnio.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Deleted: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.0.Final/server-integration/pom.xml 2014-03-14 08:32:28 UTC (rev 18510)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, 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.
- ~
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.CR2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <name>JBossWS JBoss AS 7.2.0.Final Server Side Integration</name>
- <description>JBossWS JBoss AS 7.2.0.Final Server Side Integration</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-server-integration</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.msc</groupId>
- <artifactId>jboss-msc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-ee</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-subsystem-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <fork>true</fork>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml (from rev 18512, container/jboss72/tags/jbossws-jboss720-4.3.0.Final/server-integration/pom.xml)
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml (rev 0)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/server-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, 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.
+ ~
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss720-parent</artifactId>
+ <version>4.3.0.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>JBossWS JBoss AS 7.2.0.Final Server Side Integration</name>
+ <description>JBossWS JBoss AS 7.2.0.Final Server Side Integration</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss720-server-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ee</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-subsystem-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <fork>true</fork>
+ <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.0.Final/tests-integration/pom.xml 2014-03-14 08:32:28 UTC (rev 18510)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, 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.
- ~
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.CR2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <name>JBossWS JBoss AS 7.2.0.Final Tests Side Integration</name>
- <description>JBossWS JBoss AS 7.2.0.Final Tests Side Integration</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-tests-integration</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <!-- For compiling and using this submodule to integrate with JBossAS -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-controller-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-security</artifactId>
- </dependency>
- <!-- For running tests using this submodule - see [JBWS-3484] -->
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-remote-naming</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- </dependency>
- </dependencies>
-
-</project>
Copied: container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml (from rev 18512, container/jboss72/tags/jbossws-jboss720-4.3.0.Final/tests-integration/pom.xml)
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml (rev 0)
+++ container/jboss72/tags/jbossws-jboss720-4.3.1.Final/tests-integration/pom.xml 2014-10-16 10:36:45 UTC (rev 18990)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, 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.
+ ~
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss720-parent</artifactId>
+ <version>4.3.0.Final</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>JBossWS JBoss AS 7.2.0.Final Tests Side Integration</name>
+ <description>JBossWS JBoss AS 7.2.0.Final Tests Side Integration</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss720-tests-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- For compiling and using this submodule to integrate with JBossAS -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+ <!-- For running tests using this submodule - see [JBWS-3484] -->
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remotingjmx</groupId>
+ <artifactId>remoting-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
9 years, 6 months
- 1
- 0
JBossWS SVN: r18989 - in container/jboss72/branches/jbossws-jboss720-4.3.x: server-integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 06:35:46 -0400 (Thu, 16 Oct 2014)
New Revision: 18989
Modified:
container/jboss72/branches/jbossws-jboss720-4.3.x/pom.xml
container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/pom.xml
container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/pom.xml
Log:
Set versions for next dev cycle
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/pom.xml
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/pom.xml 2014-10-16 10:35:10 UTC (rev 18988)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/pom.xml 2014-10-16 10:35:46 UTC (rev 18989)
@@ -35,13 +35,13 @@
<description>JBossWS JBoss AS 7.2.0.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss72/tags/jbo...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss72/tags/jbossw...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss72/tags/jbossws-j...</url>
</scm>
<modules>
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/pom.xml
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/pom.xml 2014-10-16 10:35:10 UTC (rev 18988)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/pom.xml 2014-10-16 10:35:46 UTC (rev 18989)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/pom.xml
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/pom.xml 2014-10-16 10:35:10 UTC (rev 18988)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/pom.xml 2014-10-16 10:35:46 UTC (rev 18989)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-parent</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
9 years, 6 months
- 1
- 0
JBossWS SVN: r18988 - container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 06:35:10 -0400 (Thu, 16 Oct 2014)
New Revision: 18988
Modified:
container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
Allow resource service restart when removing https connector
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 10:10:27 UTC (rev 18987)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 10:35:10 UTC (rev 18988)
@@ -291,6 +291,7 @@
public void removeHttpsConnector() throws Exception {
try {
ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", REMOVE);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
applyUpdate(op);
} finally {
httpsConnSemaphore.release();
9 years, 6 months
- 1
- 0
JBossWS SVN: r18987 - container/jboss72/branches.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 06:10:27 -0400 (Thu, 16 Oct 2014)
New Revision: 18987
Added:
container/jboss72/branches/jbossws-jboss720-4.3.x/
Log:
Creating 4.3.x maintenance branch for AS720 integration layer
9 years, 6 months
- 1
- 0
JBossWS SVN: r18986 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-10-15 16:46:05 -0400 (Wed, 15 Oct 2014)
New Revision: 18986
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java
Log:
[JBWS-3792] added patch code from jira
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java 2014-10-15 08:03:43 UTC (rev 18985)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java 2014-10-15 20:46:05 UTC (rev 18986)
@@ -210,10 +210,13 @@
}
else if (match(reader, WSDL_NS, IMPORT)) {
final String location = reader.getAttributeValue(null, LOCATION);
- final String url = wsdlUrl.toString();
- final String newUrl = url.substring(0, url.lastIndexOf("/") + (location.startsWith("/") ? 0 : 1)) + location;
- if (!metadata.getImports().containsKey(newUrl)) {
- metadata.getImports().put(newUrl, false);
+ try {
+ final String newUrl = new URL(wsdlUrl, location).toExternalForm();
+ if (!metadata.getImports().containsKey(newUrl)) {
+ metadata.getImports().put(newUrl, false);
+ }
+ } catch (MalformedURLException e) {
+ throw MESSAGES.failedToRead(wsdlUrl.toExternalForm(), e.getMessage(), e);
}
}
continue;
9 years, 6 months
- 1
- 0
JBossWS SVN: r18985 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-15 04:03:43 -0400 (Wed, 15 Oct 2014)
New Revision: 18985
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3841] Upgrade to woodstox 4.4.1
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-10-14 09:53:24 UTC (rev 18984)
+++ stack/cxf/trunk/pom.xml 2014-10-15 08:03:43 UTC (rev 18985)
@@ -103,7 +103,7 @@
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>2.0.2</xmlsec.version>
<wss4j.version>2.0.2</wss4j.version>
- <wstx.version>4.2.0</wstx.version>
+ <wstx.version>4.4.1</wstx.version>
<spring.version>3.2.8.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
<jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
9 years, 6 months
- 1
- 0
JBossWS SVN: r18984 - in spi/trunk/src/main: java/org/jboss/wsf/spi/metadata/j2ee and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-10-14 05:53:24 -0400 (Tue, 14 Oct 2014)
New Revision: 18984
Added:
spi/trunk/src/main/resources/schema/jboss_web_services_1.3.xsd
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
Log:
[JBWS-2680]:Support configure realm-name in jboss-webservices.xml
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2014-10-14 09:52:09 UTC (rev 18983)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2014-10-14 09:53:24 UTC (rev 18984)
@@ -38,6 +38,8 @@
public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee";
public static final String AUTH_METHOD = "auth-method";
+
+ public static final String REALM_NAME = "realm-name";
public static final String CHAIN_PORT_PATTERN = "port-name-pattern";
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java 2014-10-14 09:52:09 UTC (rev 18983)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java 2014-10-14 09:53:24 UTC (rev 18984)
@@ -30,12 +30,19 @@
public class EJBSecurityMetaData
{
private final String authMethod;
+ private final String realmName;
private final String transportGuarantee;
private final boolean secureWSDLAccess;
public EJBSecurityMetaData(String authMethod, String transportGuarantee, boolean secureWSDLAccess)
{
+ this(authMethod, null, transportGuarantee, secureWSDLAccess);
+ }
+
+ public EJBSecurityMetaData(String authMethod, String realmName, String transportGuarantee, boolean secureWSDLAccess)
+ {
this.authMethod = authMethod;
+ this.realmName = realmName;
this.transportGuarantee = transportGuarantee;
this.secureWSDLAccess = secureWSDLAccess;
}
@@ -54,4 +61,9 @@
{
return secureWSDLAccess;
}
+
+ public String getRealmName()
+ {
+ return realmName;
+ }
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java 2014-10-14 09:52:09 UTC (rev 18983)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java 2014-10-14 09:53:24 UTC (rev 18984)
@@ -34,14 +34,22 @@
private final String authMethod;
private final String transportGuarantee;
private final Boolean secureWSDLAccess;
+ private final String realmName;
public JBossPortComponentMetaData(String ejbName, String portComponentName, String portComponentURI,
String authMethod, String transportGuarantee, Boolean secureWSDLAccess)
{
+ this(ejbName, portComponentName, portComponentURI, authMethod, null, transportGuarantee, secureWSDLAccess);
+ }
+
+ public JBossPortComponentMetaData(String ejbName, String portComponentName, String portComponentURI,
+ String authMethod, String realmName, String transportGuarantee, Boolean secureWSDLAccess)
+ {
this.ejbName = ejbName;
this.portComponentName = portComponentName;
this.portComponentURI = portComponentURI;
this.authMethod = authMethod;
+ this.realmName = realmName;
this.transportGuarantee = transportGuarantee;
this.secureWSDLAccess = secureWSDLAccess;
}
@@ -69,5 +77,9 @@
public Boolean getSecureWSDLAccess() {
return secureWSDLAccess;
}
+
+ public String getRealmName () {
+ return realmName;
+ }
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2014-10-14 09:52:09 UTC (rev 18983)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2014-10-14 09:53:24 UTC (rev 18984)
@@ -29,6 +29,7 @@
import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_FILE;
import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_NAME;
import static org.jboss.wsf.spi.metadata.ParserConstants.CONTEXT_ROOT;
+import static org.jboss.wsf.spi.metadata.ParserConstants.REALM_NAME;
import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_NAME;
import static org.jboss.wsf.spi.metadata.ParserConstants.JBOSSEE_NS;
import static org.jboss.wsf.spi.metadata.ParserConstants.NAME;
@@ -211,6 +212,7 @@
String portComponentName = null;
String portComponentURI = null;
String authMethod = null;
+ String realmName = null;
String transportGuarantee = null;
Boolean secureWsdlAccess = null;
while (reader.hasNext()) {
@@ -218,7 +220,7 @@
case XMLStreamConstants.END_ELEMENT: {
if (match(reader, nsUri, PORT_COMPONENT)) {
return new JBossPortComponentMetaData(ejbName, portComponentName, portComponentURI,
- authMethod, transportGuarantee, secureWsdlAccess);
+ authMethod, realmName, transportGuarantee, secureWsdlAccess);
} else {
throw MESSAGES.unexpectedEndTag(getDescriptorForLogs(), reader.getLocalName());
}
@@ -232,6 +234,8 @@
portComponentURI = getElementText(reader);
} else if (match(reader, nsUri, AUTH_METHOD)) {
authMethod = getElementText(reader);
+ } else if (match(reader, nsUri, REALM_NAME)) {
+ realmName = getElementText(reader);
} else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) {
transportGuarantee = getElementText(reader);
} else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) {
Added: spi/trunk/src/main/resources/schema/jboss_web_services_1.3.xsd
===================================================================
--- spi/trunk/src/main/resources/schema/jboss_web_services_1.3.xsd (rev 0)
+++ spi/trunk/src/main/resources/schema/jboss_web_services_1.3.xsd 2014-10-14 09:53:24 UTC (rev 18984)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.3">
+
+ <xsd:element name="webservices" type="jboss:webservicesType"/>
+
+ <xsd:complexType name="webservicesType">
+ <xsd:sequence>
+ <xsd:element name="context-root" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-name" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-file" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="property" type="jboss:webservicePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="webservice-description" type="jboss:webserviceDescriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="portComponentType">
+ <xsd:sequence>
+ <xsd:element name="ejb-name" type="xsd:token"/>
+ <xsd:element name="port-component-name" type="xsd:token"/>
+ <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="realm-name" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webserviceDescriptionType">
+ <xsd:sequence>
+ <xsd:element name="webservice-description-name" type="xsd:token"/>
+ <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webservicePropertyType">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string"/>
+ <xsd:element name="value" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
Property changes on: spi/trunk/src/main/resources/schema/jboss_web_services_1.3.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
9 years, 6 months
- 1
- 0
JBossWS SVN: r18983 - api/trunk/src/main/java/org/jboss/ws/api/annotation.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-10-14 05:52:09 -0400 (Tue, 14 Oct 2014)
New Revision: 18983
Modified:
api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java
Log:
[JBWS-2680]:Support configure realm-name with @WebContext
Modified: api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java 2014-10-13 14:19:17 UTC (rev 18982)
+++ api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java 2014-10-14 09:52:09 UTC (rev 18983)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -94,5 +94,10 @@
* Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723
*/
boolean secureWSDLAccess() default false;
+
+ /**
+ * Description of the resource being accessed
+ */
+ String realmName() default "";
}
9 years, 6 months
- 1
- 0