JBossWS SVN: r7772 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 12:39:26 -0400 (Wed, 02 Jul 2008)
New Revision: 7772
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Removing useless comment
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 16:34:32 UTC (rev 7771)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 16:39:26 UTC (rev 7772)
@@ -14,9 +14,6 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [JBWS-1178] Multiple virtual host and soap:address problem
-#org/jboss/test/ws/jaxws/jbws1178/**
-
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
15 years, 10 months
JBossWS SVN: r7771 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 12:34:32 -0400 (Wed, 02 Jul 2008)
New Revision: 7771
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Enabling webserviceref tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 16:32:29 UTC (rev 7770)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 16:34:32 UTC (rev 7771)
@@ -8,10 +8,6 @@
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-# TODO: Fix classpath to ClientLauncher
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
15 years, 10 months
JBossWS SVN: r7770 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 12:32:29 -0400 (Wed, 02 Jul 2008)
New Revision: 7770
Modified:
stack/metro/trunk/pom.xml
Log:
Moving to the latest container integration for AS 5
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-07-02 15:27:03 UTC (rev 7769)
+++ stack/metro/trunk/pom.xml 2008-07-02 16:32:29 UTC (rev 7770)
@@ -53,7 +53,7 @@
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
<jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.2.GA</jbossws.jboss501.version>
+ <jbossws.jboss501.version>3.0.2-SNAPSHOT</jbossws.jboss501.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
15 years, 10 months
JBossWS SVN: r7769 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 11:27:03 -0400 (Wed, 02 Jul 2008)
New Revision: 7769
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Update excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 15:21:36 UTC (rev 7768)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 15:27:03 UTC (rev 7769)
@@ -79,4 +79,4 @@
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-2194] request requires HTTP authentication: Unauthorized
-#org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
15 years, 10 months
JBossWS SVN: r7768 - framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 11:21:36 -0400 (Wed, 02 Jul 2008)
New Revision: 7768
Modified:
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml
Log:
[JBWS-2130] Missing context-root configuration
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2008-07-02 14:54:48 UTC (rev 7767)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2008-07-02 15:21:36 UTC (rev 7768)
@@ -2,7 +2,9 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
<jboss>
-
+ <webservices>
+ <context-root>/jaxws-jbws1841</context-root>
+ </webservices>
<enterprise-beans>
<session>
<ejb-name>StatelessBean</ejb-name>
15 years, 10 months
JBossWS SVN: r7767 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 10:54:48 -0400 (Wed, 02 Jul 2008)
New Revision: 7767
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2130] Updating excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-02 14:51:23 UTC (rev 7766)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-07-02 14:54:48 UTC (rev 7767)
@@ -14,6 +14,9 @@
# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
+# [JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
@@ -41,10 +44,6 @@
org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-02 14:51:23 UTC (rev 7766)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-07-02 14:54:48 UTC (rev 7767)
@@ -14,6 +14,9 @@
# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
+# [JBWS-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
@@ -41,10 +44,6 @@
org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-02 14:51:23 UTC (rev 7766)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-07-02 14:54:48 UTC (rev 7767)
@@ -41,10 +41,6 @@
org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 14:51:23 UTC (rev 7766)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-07-02 14:54:48 UTC (rev 7767)
@@ -51,10 +51,6 @@
org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
-# [JBWS-2130] WebServiceException: null is not a valid service
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1841/**
-
# [JBWS-2131] WebServiceException: Failed to build METRO runtime model
org/jboss/test/ws/jaxws/jbws1702/**
org/jboss/test/ws/jaxws/jbws1733/**
@@ -83,4 +79,4 @@
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-2194] request requires HTTP authentication: Unauthorized
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+#org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
15 years, 10 months
JBossWS SVN: r7766 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1841 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 10:51:23 -0400 (Wed, 02 Jul 2008)
New Revision: 7766
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/ejb-jar.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/jboss.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/TestService.wsdl
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml
Log:
[JBWS-2130] Fixing jbws1841 test too
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-02 14:46:29 UTC (rev 7765)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-02 14:51:23 UTC (rev 7766)
@@ -424,7 +424,19 @@
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1841/*TestCase.class"/>
</fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF_4">
+ <include name="wsdl/*"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841-as5.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1841/*TestCase.class"/>
+ </fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF">
<include name="wsdl/*"/>
<include name="ejb-jar.xml"/>
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java 2008-07-02 14:51:23 UTC (rev 7766)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1841;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+@WebServiceClient(name="EndpointService", targetNamespace="http://www.openuri.org/2004/04/HelloWorld")
+public class EndpointService extends javax.xml.ws.Service
+{
+ private final static QName TESTENDPOINTPORT = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointInterfacePort");
+
+ public EndpointService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ @WebEndpoint(name = "EndpointInterfacePort")
+ public EndpointInterface getEndpointPort() {
+ return (EndpointInterface)super.getPort(TESTENDPOINTPORT, EndpointInterface.class);
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-07-02 14:46:29 UTC (rev 7765)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-07-02 14:51:23 UTC (rev 7766)
@@ -2,6 +2,7 @@
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
import javax.xml.namespace.QName;
@@ -26,7 +27,8 @@
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar");
+ //here in the AS 5 jar we use <service-qname> that does not exist in AS 4.2.x
+ return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
}
protected void setUp() throws Exception
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-07-02 14:46:29 UTC (rev 7765)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-07-02 14:51:23 UTC (rev 7766)
@@ -31,6 +31,7 @@
* A test bean that delegates to a web service provided through serviceref injection.
*
* @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
+ * @author alessio.soldano(a)jboss.com
* @version $Revision$
*/
@Stateless(name="StatelessBean")
@@ -39,12 +40,12 @@
{
private static final Logger log = Logger.getLogger(StatelessBean.class);
- @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
+ @WebServiceRef(value = EndpointService.class, mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
EndpointInterface endpoint1;
EndpointInterface endpoint2;
- @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
+ @WebServiceRef(value = EndpointService.class, mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl")
public void setEndpoint2(EndpointInterface endpoint2)
{
this.endpoint2 = endpoint2;
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2008-07-02 14:46:29 UTC (rev 7765)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/ejb-jar.xml 2008-07-02 14:51:23 UTC (rev 7766)
@@ -11,7 +11,7 @@
<ejb-name>StatelessBean</ejb-name>
<service-ref>
<service-ref-name>service/Endpoint3</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
+ <service-interface>org.jboss.test.ws.jaxws.jbws1841.EndpointService</service-interface>
<mapped-name>jbossws-client/service/TestService</mapped-name>
<injection-target>
<injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2008-07-02 14:46:29 UTC (rev 7765)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2008-07-02 14:51:23 UTC (rev 7766)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
<jboss>
@@ -12,6 +12,8 @@
</service-ref>
<service-ref>
<service-ref-name>service/Endpoint4</service-ref-name>
+ <!-- Metro compatibility: we declare the service-qname since we're using javax.xml.ws.Service in the ejb-jar.xml -->
+ <service-qname>{http://www.openuri.org/2004/04/HelloWorld}EndpointService</service-qname>
<wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
</service-ref>
</session>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/ejb-jar.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/ejb-jar.xml 2008-07-02 14:51:23 UTC (rev 7766)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar 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/ejb-jar_3_0.xsd">
+
+ <description>jBoss test application</description>
+ <display-name>Test</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessBean</ejb-name>
+ <service-ref>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <service-interface>org.jboss.test.ws.jaxws.jbws1841.EndpointService</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
+ <injection-target-name>endpoint3</injection-target-name>
+ </injection-target>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <service-interface>org.jboss.test.ws.jaxws.jbws1841.EndpointService</service-interface>
+ <mapped-name>jbossws-client/service/TestService</mapped-name>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.jbws1841.StatelessBean</injection-target-class>
+ <injection-target-name>setEndpoint4</injection-target-name>
+ </injection-target>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/jboss.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/jboss.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/jboss.xml 2008-07-02 14:51:23 UTC (rev 7766)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessBean</ejb-name>
+ <service-ref>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/TestService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/TestService.wsdl 2008-07-02 14:51:23 UTC (rev 7766)
@@ -0,0 +1,39 @@
+<definitions name='EndpointService' targetNamespace='http://www.openuri.org/2004/04/HelloWorld'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://www.openuri.org/2004/04/HelloWorld'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types></types>
+ <message name='EndpointInterface_echoResponse'>
+ <part name='return' type='xsd:string'></part>
+ </message>
+ <message name='EndpointInterface_echo'>
+ <part name='arg0' type='xsd:string'></part>
+ </message>
+ <portType name='EndpointInterface'>
+
+ <operation name='echo' parameterOrder='arg0'>
+ <input message='tns:EndpointInterface_echo'></input>
+ <output message='tns:EndpointInterface_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+
+ <input>
+ <soap:body namespace='http://www.openuri.org/2004/04/HelloWorld' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://www.openuri.org/2004/04/HelloWorld' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+
+ <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1841/EJB3Bean'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF_4/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
JBossWS SVN: r7765 - in framework/trunk/testsuite/test/resources/jaxws/jbws1841: META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 10:46:29 -0400 (Wed, 02 Jul 2008)
New Revision: 7765
Removed:
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/application-client.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1841/application.xml
Log:
Removing useless files
Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/application-client.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/application-client.xml 2008-07-02 13:18:32 UTC (rev 7764)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/application-client.xml 2008-07-02 14:46:29 UTC (rev 7765)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>JSR-181 Annotation test</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws1841.EndpointInterface</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml 2008-07-02 13:18:32 UTC (rev 7764)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/jboss-client.xml 2008-07-02 14:46:29 UTC (rev 7765)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-</jboss-client>
Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws1841/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/application.xml 2008-07-02 13:18:32 UTC (rev 7764)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/application.xml 2008-07-02 14:46:29 UTC (rev 7765)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-<application>
- <module>
- <ejb>jsr181.jar</ejb>
- </module>
-
- <module>
- <ejb>jsr181-client.jar</ejb>
- </module>
-</application>
-
-
15 years, 10 months
JBossWS SVN: r7764 - stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 09:18:32 -0400 (Wed, 02 Jul 2008)
New Revision: 7764
Modified:
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
Log:
Removing useless warning
Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-07-02 12:39:45 UTC (rev 7763)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/client/ServiceObjectFactory.java 2008-07-02 13:18:32 UTC (rev 7764)
@@ -140,9 +140,6 @@
}
}
- // Configure the service
- configureService((Service)target, serviceRef);
-
if (targetClassName != null && targetClassName.equals(serviceImplClass) == false)
{
try
@@ -185,11 +182,6 @@
}
}
- private void configureService(Service service, UnifiedServiceRefMetaData serviceRef)
- {
- log.warn("Service configuration not available in Sun-RI");
- }
-
private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException
{
UnifiedServiceRefMetaData sref;
15 years, 10 months
JBossWS SVN: r7763 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1581 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-02 08:39:45 -0400 (Wed, 02 Jul 2008)
New Revision: 7763
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java
Log:
[JBWS-2130] Adding service class since JAX-WS spec mandates it in this case (section 7.9, #2)
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-02 12:36:11 UTC (rev 7762)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-07-02 12:39:45 UTC (rev 7763)
@@ -238,6 +238,7 @@
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointService.class"/>
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF">
<include name="wsdl/**"/>
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2008-07-02 12:36:11 UTC (rev 7762)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2008-07-02 12:39:45 UTC (rev 7763)
@@ -31,7 +31,7 @@
@Remote(EJB3Remote.class)
public class EJB3Bean implements EJB3Remote
{
- @WebServiceRef(wsdlLocation = "META-INF/wsdl/TestService.wsdl")
+ @WebServiceRef(value = EndpointService.class, wsdlLocation = "META-INF/wsdl/TestService.wsdl")
public EndpointInterface port;
public String runTest(String message)
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java 2008-07-02 12:39:45 UTC (rev 7763)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1581;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+@WebServiceClient(name="EndpointService", targetNamespace="http://jbws1581.jaxws.ws.test.jboss.org/")
+public class EndpointService extends javax.xml.ws.Service
+{
+ private final static QName TESTENDPOINTPORT = new QName("http://jbws1581.jaxws.ws.test.jboss.org/", "EndpointBeanPort");
+
+ public EndpointService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ @WebEndpoint(name = "EndpointBeanPort")
+ public EndpointInterface getEndpointPort() {
+ return (EndpointInterface)super.getPort(TESTENDPOINTPORT, EndpointInterface.class);
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months