7:42 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-06-15 08:42:58 -0400 (Fri, 15 Jun 2007)
New Revision: 3592
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/
Removed:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/wsdl/
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/WEB-INF/
Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml
Log:
[JBWS-1556] @WebWservice does not work with class isolation
Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html 2007-06-15
08:02:07 UTC (rev 3591)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/index.html 2007-06-15
12:42:58 UTC (rev 3592)
@@ -1,6 +1,6 @@
<html><head>
<meta http-equiv='Content-Type content='text/html;
charset=iso-8859-1'>
-<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title>
+<title>JBossWS</title>
<link rel='stylesheet' href='./styles.css'>
</head>
<body>
@@ -33,9 +33,9 @@
<ul>
<li><a
href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and
samples</a></li>
- <li><a
href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ&l...
- <li><a
href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html&qu...
guide</a></li>
- <li><a
href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS
WIKI</a></li>
+ <li><a
href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs"&...
+ <li><a
href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide&q...
guide</a></li>
+ <li><a
href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">...
WIKI</a></li>
</ul>
</fieldset>
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-15
08:02:07 UTC (rev 3591)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-15
12:42:58 UTC (rev 3592)
@@ -206,6 +206,22 @@
</classes>
</war>
+ <!-- jaxws-jbws1556 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include
name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-jbws1556.jar"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF">
+ <include name="application.xml"/>
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-jbws1566-->
<jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
<fileset dir="${tests.output.dir}/classes">
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-15
08:02:07 UTC (rev 3591)
+++
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-15
12:42:58 UTC (rev 3592)
@@ -137,7 +137,13 @@
wsdlService = wsdlDefinitions.getService(serviceName);
}
if (wsdlService == null)
- throw new IllegalArgumentException("Cannot obtain wsdl service: " +
serviceName);
+ {
+ List<QName> serviceNames = new ArrayList<QName>();
+ for (WSDLService wsdls : wsdlDefinitions.getServices())
+ serviceNames.add(wsdls.getName());
+
+ throw new IllegalArgumentException("Cannot obtain wsdl service: " +
serviceName + " we have " + serviceNames);
+ }
// Build endpoint meta data
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
(rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2007-06-15
12:42:58 UTC (rev 3592)
@@ -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.jbws1556;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@Stateless
+
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@WebContext(contextRoot = "jaxws-jbws1556")
+public class EJB3Bean
+{
+ @WebMethod
+ public String hello(String msg)
+ {
+ return msg;
+ }
+}
Property changes on:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
(rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java 2007-06-15
12:42:58 UTC (rev 3592)
@@ -0,0 +1,20 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Nov 02 21:17:37 CET 2006
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jaxws.jbws1556;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface
+{
+ String hello(String msg);
+}
Property changes on:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
(rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2007-06-15
12:42:58 UTC (rev 3592)
@@ -0,0 +1,58 @@
+/*
+ * 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.jbws1556;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1556] @WebWservice does not work with class isolation
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1556
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 15-Jun-2007
+ */
+public class JBWS1556EarTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1556EarTestCase.class,
"jaxws-jbws1556.ear");
+ }
+
+ public void testEndpointAccess() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-jbws1556/EJB3Bean?wsdl");
+ QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/";,
"EJB3BeanService");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointInterface port = service.getPort(EndpointInterface.class);
+ String hello = port.hello("hello");
+ assertEquals("hello", hello);
+ }
+}
\ No newline at end of file
Property changes on:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556 (from rev
3591, branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581)
Modified:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581/META-INF/application.xml 2007-06-15
08:02:07 UTC (rev 3591)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml 2007-06-15
12:42:58 UTC (rev 3592)
@@ -6,11 +6,6 @@
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
version="1.4">
- <module>
- <web>
- <web-uri>jaxws-jbws1581.war</web-uri>
- <context-root>jaxws-jbws1581</context-root>
- </web>
- </module>
+ <module><ejb>jaxws-jbws1556.jar</ejb></module>
</application>
\ No newline at end of file
Modified:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2007-06-15
08:02:07 UTC (rev 3591)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml 2007-06-15
12:42:58 UTC (rev 3592)
@@ -5,5 +5,5 @@
"http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
<jboss-app>
-
<loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.ear</loader-repository>
+
<loader-repository>jbossws.jbws1556:domain=jaxws-jbws1556.ear</loader-repository>
</jboss-app>
\ No newline at end of file