JBossWS SVN: r15162 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-26 07:01:52 -0400 (Wed, 26 Oct 2011)
New Revision: 15162
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBPAPP-7430] Adding option for specifying jbossws-native-core filename on target AS distro through sys prop
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-25 13:46:49 UTC (rev 15161)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-26 11:01:52 UTC (rev 15162)
@@ -1273,6 +1273,8 @@
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritte by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version specified through system property -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
13 years, 2 months
JBossWS SVN: r15161 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:46:49 -0400 (Tue, 25 Oct 2011)
New Revision: 15161
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-25 13:44:12 UTC (rev 15160)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-25 13:46:49 UTC (rev 15161)
@@ -747,6 +747,9 @@
<!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+ <!--# [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -926,6 +929,9 @@
<!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+ <!--# [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -1050,6 +1056,9 @@
<!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+ <!-- [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
@@ -1302,6 +1311,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- waiting for AS7 upstream -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
13 years, 2 months
JBossWS SVN: r15160 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:44:12 -0400 (Tue, 25 Oct 2011)
New Revision: 15160
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
update excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-25 13:38:13 UTC (rev 15159)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-25 13:44:12 UTC (rev 15160)
@@ -569,6 +569,9 @@
<!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+ <!-- # [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -719,6 +722,9 @@
<!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+ <!-- # [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -839,6 +845,9 @@
<!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
<exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+ <!-- [JBWS-3276] fixed since AS 7.1 -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
<!-- TODO: Injections support for WS components -->
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
@@ -1014,6 +1023,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- waiting for AS7 upstream -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
13 years, 2 months
JBossWS SVN: r15159 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:38:13 -0400 (Tue, 25 Oct 2011)
New Revision: 15159
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOIface.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-INF/web.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3276] providing anonymous POJO test cases
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-25 09:57:17 UTC (rev 15158)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-25 13:38:13 UTC (rev 15159)
@@ -1106,6 +1106,22 @@
</webinf>
</war>
+ <!-- jaxws-jbws3276 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3276/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3276/POJOImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/>
+ </classes>
+ </war>
+
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase2.war" needxmlfile="false">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws3293 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3293.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.java 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3276.POJOIface",
+ targetNamespace = "org.jboss.test.ws.jaxws.jbws3276",
+ serviceName = "AnonymousPOJOService"
+)
+public class AnonymousPOJO
+{
+
+ public String echo(final String s)
+ {
+ return s + " from anonymous POJO";
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOIface.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOIface.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOIface.java 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+@SOAPBinding
+public interface POJOIface
+{
+
+ String echo(String s);
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOImpl.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/POJOImpl.java 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws3276.POJOIface",
+ targetNamespace = "org.jboss.test.ws.jaxws.jbws3276",
+ serviceName = "POJOImplService"
+)
+public class POJOImpl
+{
+
+ public String echo(final String s)
+ {
+ return s + " from POJO";
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3276] Tests anonymous POJO in web archive that contains web.xml with other endpoint.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class Usecase1TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(Usecase1TestCase.class, "jaxws-jbws3276-usecase1.war");
+ }
+
+ public void testAnonymousEndpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
+ final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/AnonymousPOJOService?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final POJOIface port = service.getPort(POJOIface.class);
+ final String result = port.echo("hello");
+ assertEquals("hello from anonymous POJO", result);
+ }
+
+ public void testDeclaredEndpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "POJOImplService");
+ final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/POJOService?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final POJOIface port = service.getPort(POJOIface.class);
+ final String result = port.echo("hello");
+ assertEquals("hello from POJO", result);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3276] Tests anonymous POJO in web archive that is missing web.xml.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class Usecase2TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(Usecase2TestCase.class, "jaxws-jbws3276-usecase2.war");
+ }
+
+ public void testAnonymousEndpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
+ final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase2/AnonymousPOJOService?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final POJOIface port = service.getPort(POJOIface.class);
+ final String result = port.echo("hello");
+ assertEquals("hello from anonymous POJO", result);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-INF/web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-INF/web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-INF/web.xml 2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ metadata-complete="false">
+ <servlet>
+ <servlet-name>POJOImpl</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3276.POJOImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>POJOImpl</servlet-name>
+ <url-pattern>/POJOService</url-pattern>
+ </servlet-mapping>
+</web-app>
13 years, 2 months
JBossWS SVN: r15158 - in stack/cxf/trunk: modules/client and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-25 05:57:17 -0400 (Tue, 25 Oct 2011)
New Revision: 15158
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWX-3374] Move to cxf-xjc utils 2.4.0 and remove dependency on cxf-xjc-bug671
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/client/pom.xml 2011-10-25 09:57:17 UTC (rev 15158)
@@ -103,10 +103,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-10-25 09:57:17 UTC (rev 15158)
@@ -1,4 +1,3 @@
com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-10-25 09:57:17 UTC (rev 15158)
@@ -37,7 +37,6 @@
rem CXF XJC patched plugins
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar
rem shared jaxws libs
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-10-25 09:57:17 UTC (rev 15158)
@@ -88,7 +88,6 @@
# CXF XJC patched plugins
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
# shared jaxws libs
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-10-25 09:57:17 UTC (rev 15158)
@@ -35,7 +35,6 @@
rem CXF XJC patched plugins
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-bug671.jar
rem shared jaxws libs
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-10-25 09:57:17 UTC (rev 15158)
@@ -89,7 +89,6 @@
# CXF XJC patched plugins
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
# shared jaxws libs
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-10-25 09:57:17 UTC (rev 15158)
@@ -115,10 +115,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/pom.xml 2011-10-25 09:57:17 UTC (rev 15158)
@@ -57,7 +57,7 @@
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.4.4-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
- <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
+ <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
@@ -803,45 +803,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- <version>${cxf.xjcplugins.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<version>${cxf.xjcplugins.version}</version>
<exclusions>
13 years, 2 months
JBossWS SVN: r15157 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-21 05:50:16 -0400 (Fri, 21 Oct 2011)
New Revision: 15157
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
Log:
provide default constructor as required by JAXWS spec
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-10-21 09:21:37 UTC (rev 15156)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java 2011-10-21 09:50:16 UTC (rev 15157)
@@ -27,6 +27,8 @@
public class HelloWorldImpl implements HelloWorld
{
private ClassLoader _deploymentClassLoader;
+
+ public HelloWorldImpl() {}
public HelloWorldImpl(ClassLoader classloader)
{
13 years, 2 months
JBossWS SVN: r15156 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-21 05:21:37 -0400 (Fri, 21 Oct 2011)
New Revision: 15156
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
each endpoint should use unique serviceName
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-10-21 08:51:17 UTC (rev 15155)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-10-21 09:21:37 UTC (rev 15156)
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
-@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
+@WebService(serviceName="EndpointService2", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
public class EndpointImpl2
{
// Provide logging
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-10-21 08:51:17 UTC (rev 15155)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-10-21 09:21:37 UTC (rev 15156)
@@ -82,8 +82,8 @@
}
//call endpoint
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"));
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
res.getWriter().print("1");
}
@@ -110,8 +110,7 @@
}
}
- private static void invoke(URL wsdlURL) throws Exception {
- QName serviceName = new QName("http://publish.ws.test.jboss.org/", "EndpointService");
+ private static void invoke(URL wsdlURL, QName serviceName) throws Exception {
Service service = Service.create(wsdlURL, serviceName);
org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class);
String result = port.echo("Foo");
13 years, 2 months
JBossWS SVN: r15155 - stack/native/trunk/modules/testsuite/native-tests/scripts.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-21 04:51:17 -0400 (Fri, 21 Oct 2011)
New Revision: 15155
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-interop.xml
Log:
proper excludes
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-interop.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-interop.xml 2011-10-20 06:45:26 UTC (rev 15154)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-interop.xml 2011-10-21 08:51:17 UTC (rev 15155)
@@ -181,6 +181,9 @@
webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/>
<include name="org/jboss/test/ws/interop/*.class"/>
</classes>
@@ -213,6 +216,9 @@
webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/>
<include name="org/jboss/test/ws/interop/*.class"/>
</classes>
@@ -245,6 +251,9 @@
webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.class"/>
+ <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/>
<include name="org/jboss/test/ws/interop/*.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF">
13 years, 2 months
JBossWS SVN: r15154 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-20 02:45:26 -0400 (Thu, 20 Oct 2011)
New Revision: 15154
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-20 06:40:45 UTC (rev 15153)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-20 06:45:26 UTC (rev 15154)
@@ -998,9 +998,6 @@
<!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
13 years, 2 months
JBossWS SVN: r15153 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-20 02:40:45 -0400 (Thu, 20 Oct 2011)
New Revision: 15153
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-19 16:50:29 UTC (rev 15152)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-20 06:40:45 UTC (rev 15153)
@@ -1288,9 +1288,6 @@
<!--# [JBWS-2397] Fix jbws1797 testcase-->
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
-
<!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
<exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
13 years, 2 months