JBossWS SVN: r13435 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-08 15:34:10 -0500 (Wed, 08 Dec 2010)
New Revision: 13435
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBPAPP-5546] SAAJ Where an Element is added to the SOAPBody this should be converted to a SOAPElement.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 19:46:12 UTC (rev 13434)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 20:34:10 UTC (rev 13435)
@@ -292,8 +292,21 @@
return validChild == false;
}
- private static SOAPBodyElementDoc convertToBodyElement(Node node)
+ private static SOAPBodyElementDoc convertToBodyElement(Node node) throws DOMException
{
+ if (!(node instanceof SOAPElementImpl) && (node instanceof Element))
+ {
+ try
+ {
+ SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
+ node = (SOAPElementImpl)soapFactory.createElement((Element)node);
+ }
+ catch (SOAPException ex)
+ {
+ throw new DOMException(DOMException.INVALID_STATE_ERR, "Could not convert Element to a SOAPElement");
+ }
+ }
+
if (!(node instanceof SOAPElementImpl))
throw new IllegalArgumentException("SOAPElement expected");
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 19:46:12 UTC (rev 13434)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 20:34:10 UTC (rev 13435)
@@ -38,6 +38,7 @@
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -97,6 +98,24 @@
assertEquals(se, se2);
}
+ // JBWS-3170
+ public void testAppendNonSoapElement() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage();
+ SOAPEnvelope env = soapMessage.getSOAPPart().getEnvelope();
+ SOAPBody body = env.getBody();
+
+ Element e = body.getOwnerDocument().createElement("MyChild1");
+ SOAPElement se = (SOAPElement)body.appendChild(e);
+ assertNotNull("Expected an element", se);
+
+ assertEquals("Expected 1 child element", 1, getIteratorCount(body.getChildElements()));
+
+ SOAPElement se2 = (SOAPElement)body.getChildElements().next();
+ assertEquals(se, se2);
+ }
+
//JBWS-2346
public void testGetElementByTagNameNS() throws Exception
{
13 years, 5 months
- 1
- 0
JBossWS SVN: r13434 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-08 14:46:12 -0500 (Wed, 08 Dec 2010)
New Revision: 13434
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBPAPP-5545] SAAJ Where an Element is added to the SOAPBody this should be converted to a SOAPElement
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 19:28:16 UTC (rev 13433)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 19:46:12 UTC (rev 13434)
@@ -290,8 +290,21 @@
return validChild == false;
}
- private static SOAPBodyElementDoc convertToBodyElement(Node node)
+ private static SOAPBodyElementDoc convertToBodyElement(Node node) throws DOMException
{
+ if (!(node instanceof SOAPElementImpl) && (node instanceof Element))
+ {
+ try
+ {
+ SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
+ node = (SOAPElementImpl)soapFactory.createElement((Element)node);
+ }
+ catch (SOAPException ex)
+ {
+ throw new DOMException(DOMException.INVALID_STATE_ERR, "Could not convert Element to a SOAPElement");
+ }
+ }
+
if (!(node instanceof SOAPElementImpl))
throw new IllegalArgumentException("SOAPElement expected");
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 19:28:16 UTC (rev 13433)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 19:46:12 UTC (rev 13434)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.common.soap;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
@@ -38,6 +37,7 @@
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -97,6 +97,24 @@
assertEquals(se, se2);
}
+ // JBWS-3170
+ public void testAppendNonSoapElement() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage();
+ SOAPEnvelope env = soapMessage.getSOAPPart().getEnvelope();
+ SOAPBody body = env.getBody();
+
+ Element e = body.getOwnerDocument().createElement("MyChild1");
+ SOAPElement se = (SOAPElement)body.appendChild(e);
+ assertNotNull("Expected an element", se);
+
+ assertEquals("Expected 1 child element", 1, getIteratorCount(body.getChildElements()));
+
+ SOAPElement se2 = (SOAPElement)body.getChildElements().next();
+ assertEquals(se, se2);
+ }
+
//JBWS-2346
public void testGetElementByTagNameNS() throws Exception
{
13 years, 5 months
- 1
- 0
JBossWS SVN: r13433 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-08 14:28:16 -0500 (Wed, 08 Dec 2010)
New Revision: 13433
Added:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5547/
Log:
[JBPAPP-5547] Branch for patch.
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5547 (from rev 13432, stack/native/tags/jbossws-native-3.1.2.SP7)
13 years, 5 months
- 1
- 0
JBossWS SVN: r13432 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-08 13:48:37 -0500 (Wed, 08 Dec 2010)
New Revision: 13432
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBWS-3170] SAAJ Where an Element is added to the SOAPBody this should be converted to a SOAPElement
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 16:52:32 UTC (rev 13431)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 18:48:37 UTC (rev 13432)
@@ -269,8 +269,21 @@
return validChild == false;
}
- private static SOAPBodyElementDoc convertToBodyElement(Node node)
+ private static SOAPBodyElementDoc convertToBodyElement(Node node) throws DOMException
{
+ if (!(node instanceof SOAPElementImpl) && (node instanceof Element))
+ {
+ try
+ {
+ SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
+ node = (SOAPElementImpl)soapFactory.createElement((Element)node);
+ }
+ catch (SOAPException ex)
+ {
+ throw new DOMException(DOMException.INVALID_STATE_ERR, "Could not convert Element to a SOAPElement");
+ }
+ }
+
if (!(node instanceof SOAPElementImpl))
throw new IllegalArgumentException("SOAPElement expected");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 16:52:32 UTC (rev 13431)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2010-12-08 18:48:37 UTC (rev 13432)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.common.soap;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
@@ -38,6 +37,7 @@
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -97,6 +97,24 @@
assertEquals(se, se2);
}
+ // JBWS-3170
+ public void testAppendNonSoapElement() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage();
+ SOAPEnvelope env = soapMessage.getSOAPPart().getEnvelope();
+ SOAPBody body = env.getBody();
+
+ Element e = body.getOwnerDocument().createElement("MyChild1");
+ SOAPElement se = (SOAPElement)body.appendChild(e);
+ assertNotNull("Expected an element", se);
+
+ assertEquals("Expected 1 child element", 1, getIteratorCount(body.getChildElements()));
+
+ SOAPElement se2 = (SOAPElement)body.getChildElements().next();
+ assertEquals(se, se2);
+ }
+
//JBWS-2346
public void testGetElementByTagNameNS() throws Exception
{
13 years, 5 months
- 1
- 0
JBossWS SVN: r13431 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-12-08 11:52:32 -0500 (Wed, 08 Dec 2010)
New Revision: 13431
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
Log:
[JBPAPP-5506] Revert incorrect change.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 13:55:05 UTC (rev 13430)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2010-12-08 16:52:32 UTC (rev 13431)
@@ -292,21 +292,8 @@
return validChild == false;
}
- private static SOAPBodyElementDoc convertToBodyElement(Node node) throws DOMException
+ private static SOAPBodyElementDoc convertToBodyElement(Node node)
{
- if (!(node instanceof SOAPElementImpl) && (node instanceof Element))
- {
- try
- {
- SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
- node = (SOAPElementImpl)soapFactory.createElement((Element)node);
- }
- catch (SOAPException ex)
- {
- throw new DOMException(DOMException.INVALID_STATE_ERR, "Could not convert Element to a SOAPElement");
- }
- }
-
if (!(node instanceof SOAPElementImpl))
throw new IllegalArgumentException("SOAPElement expected");
13 years, 5 months
- 1
- 0
JBossWS SVN: r13430 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-08 08:55:05 -0500 (Wed, 08 Dec 2010)
New Revision: 13430
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
framework/trunk/testsuite/test/resources/jaxws/jbws3026/
framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3026] providing test case
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-12-08 13:55:05 UTC (rev 13430)
@@ -927,6 +927,22 @@
</metainf>
</jar>
+ <!-- jaxws-jbws3026 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
+ </fileset>
+ </jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3026-web.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3026/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
+ </classes>
+ </war>
+
<!-- jaxws-jbws3034 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3034.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3034/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026 (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026)
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-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-3026] Injecting EJB into Webservice via @EJB(mappedName="MyBean/remote")
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class JBWS3026TestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS3026TestCase.class, "jaxws-jbws3026-ejb.jar,jaxws-jbws3026-web.war");
- }
-
- public void testUsecase1WithoutSar() throws Exception
- {
- String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws3026-web/MyService";
- QName serviceName = new QName("http://jbws3026.jaxws.ws.test.jboss.org/", "MyService");
- Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
- MyService port = (MyService)service.getPort(MyService.class);
- port.useBean();
- port.thisOneWorks();
- }
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+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-3026] Injecting EJB into Webservice via @EJB(mappedName="MyBean/remote")
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS3026TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3026TestCase.class, "jaxws-jbws3026-ejb.jar,jaxws-jbws3026-web.war");
+ }
+
+ public void testUsecase1WithoutSar() throws Exception
+ {
+ String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws3026-web/MyService";
+ QName serviceName = new QName("http://jbws3026.jaxws.ws.test.jboss.org/", "MyService");
+ Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
+ MyService port = (MyService)service.getPort(MyService.class);
+ port.useBean();
+ port.thisOneWorks();
+ }
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-@Stateless
-(a)Remote(MyBeanRemote.class)
-(a)Local(MyBeanLocal.class)
-public class MyBean implements MyBeanLocal
-{
- public void myMethod()
- {
- System.out.println("I'll do nothing");
- }
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+@Stateless
+(a)Remote(MyBeanRemote.class)
+(a)Local(MyBeanLocal.class)
+public class MyBean implements MyBeanLocal
+{
+ public void myMethod()
+ {
+ System.out.println("I'll do nothing");
+ }
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-import javax.ejb.Local;
-
-@Local
-public interface MyBeanLocal
-{
- public void myMethod();
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Local;
+
+@Local
+public interface MyBeanLocal
+{
+ public void myMethod();
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface MyBeanRemote
-{
- public void myMethod();
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface MyBeanRemote
+{
+ public void myMethod();
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-import javax.jws.WebService;
-
-@WebService
-public interface MyService
-{
- public void useBean();
- public void thisOneWorks();
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.jws.WebService;
+
+@WebService
+public interface MyService
+{
+ public void useBean();
+ public void thisOneWorks();
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws3026;
-
-import javax.ejb.EJB;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-@SOAPBinding(style = Style.RPC)
-@WebService(serviceName = "MyService", portName = "MyServicePort")
-public class MyServiceImpl implements MyService
-{
- @EJB(mappedName="MyBean/remote")
- MyBeanRemote bean;
-
- /**
- * Invoking method of injected bean
- */
- public void useBean()
- {
- bean.myMethod();
- }
-
- /**
- * This method works if you just remove the @EJB-Injection
- */
- public void thisOneWorks()
- {
- MyBeanRemote bean = lookupBean();
- if (bean != null)
- {
- bean.myMethod();
- }
- }
-
- /**
- * Looking up the bean by using JNDI
- *
- * @return
- */
- private MyBeanRemote lookupBean()
- {
- MyBeanRemote res = null;
- try
- {
- InitialContext ctx = new InitialContext();
- res= (MyBeanRemote) ctx.lookup("MyBean/remote");
- }
- catch (NamingException e)
- {
- System.out.println("Something went wrong");
- e.printStackTrace();
- }
- return res;
- }
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.EJB;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+@SOAPBinding(style = Style.RPC)
+@WebService(serviceName = "MyService", portName = "MyServicePort")
+public class MyServiceImpl implements MyService
+{
+ @EJB(mappedName="MyBean/remote")
+ MyBeanRemote bean;
+
+ /**
+ * Invoking method of injected bean
+ */
+ public void useBean()
+ {
+ bean.myMethod();
+ }
+
+ /**
+ * This method works if you just remove the @EJB-Injection
+ */
+ public void thisOneWorks()
+ {
+ MyBeanRemote bean = lookupBean();
+ if (bean != null)
+ {
+ bean.myMethod();
+ }
+ }
+
+ /**
+ * Looking up the bean by using JNDI
+ *
+ * @return
+ */
+ private MyBeanRemote lookupBean()
+ {
+ MyBeanRemote res = null;
+ try
+ {
+ InitialContext ctx = new InitialContext();
+ res= (MyBeanRemote) ctx.lookup("MyBean/remote");
+ }
+ catch (NamingException e)
+ {
+ System.out.println("Something went wrong");
+ e.printStackTrace();
+ }
+ return res;
+ }
+}
Copied: framework/trunk/testsuite/test/resources/jaxws/jbws3026 (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026)
Copied: framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF)
Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml 2010-12-08 13:43:00 UTC (rev 13429)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml 2010-12-08 13:55:05 UTC (rev 13430)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- id="WebApp_ID" version="2.5">
- <servlet>
- <servlet-name>MyService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws3026.MyServiceImpl</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>MyService</servlet-name>
- <url-pattern>/MyService</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml (from rev 13429, framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml)
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml 2010-12-08 13:55:05 UTC (rev 13430)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <servlet>
+ <servlet-name>MyService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3026.MyServiceImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>MyService</servlet-name>
+ <url-pattern>/MyService</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
13 years, 5 months
- 1
- 0
JBossWS SVN: r13429 - in framework/branches/jbossws-framework-3.4.1/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-08 08:43:00 -0500 (Wed, 08 Dec 2010)
New Revision: 13429
Added:
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/
framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/
framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml
Modified:
framework/branches/jbossws-framework-3.4.1/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3026] providing test case
Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/ant-import/build-jars-jaxws.xml 2010-12-08 11:00:53 UTC (rev 13428)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/ant-import/build-jars-jaxws.xml 2010-12-08 13:43:00 UTC (rev 13429)
@@ -927,6 +927,22 @@
</metainf>
</jar>
+ <!-- jaxws-jbws3026 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
+ </fileset>
+ </jar>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3026-web.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3026/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
+ </classes>
+ </war>
+
<!-- jaxws-jbws3034 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3034.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3034/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+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-3026] Injecting EJB into Webservice via @EJB(mappedName="MyBean/remote")
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS3026TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3026TestCase.class, "jaxws-jbws3026-ejb.jar,jaxws-jbws3026-web.war");
+ }
+
+ public void testUsecase1WithoutSar() throws Exception
+ {
+ String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws3026-web/MyService";
+ QName serviceName = new QName("http://jbws3026.jaxws.ws.test.jboss.org/", "MyService");
+ Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
+ MyService port = (MyService)service.getPort(MyService.class);
+ port.useBean();
+ port.thisOneWorks();
+ }
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBean.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+@Stateless
+(a)Remote(MyBeanRemote.class)
+(a)Local(MyBeanLocal.class)
+public class MyBean implements MyBeanLocal
+{
+ public void myMethod()
+ {
+ System.out.println("I'll do nothing");
+ }
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanLocal.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Local;
+
+@Local
+public interface MyBeanLocal
+{
+ public void myMethod();
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface MyBeanRemote
+{
+ public void myMethod();
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyService.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.jws.WebService;
+
+@WebService
+public interface MyService
+{
+ public void useBean();
+ public void thisOneWorks();
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3026/MyServiceImpl.java 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3026;
+
+import javax.ejb.EJB;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+@SOAPBinding(style = Style.RPC)
+@WebService(serviceName = "MyService", portName = "MyServicePort")
+public class MyServiceImpl implements MyService
+{
+ @EJB(mappedName="MyBean/remote")
+ MyBeanRemote bean;
+
+ /**
+ * Invoking method of injected bean
+ */
+ public void useBean()
+ {
+ bean.myMethod();
+ }
+
+ /**
+ * This method works if you just remove the @EJB-Injection
+ */
+ public void thisOneWorks()
+ {
+ MyBeanRemote bean = lookupBean();
+ if (bean != null)
+ {
+ bean.myMethod();
+ }
+ }
+
+ /**
+ * Looking up the bean by using JNDI
+ *
+ * @return
+ */
+ private MyBeanRemote lookupBean()
+ {
+ MyBeanRemote res = null;
+ try
+ {
+ InitialContext ctx = new InitialContext();
+ res= (MyBeanRemote) ctx.lookup("MyBean/remote");
+ }
+ catch (NamingException e)
+ {
+ System.out.println("Something went wrong");
+ e.printStackTrace();
+ }
+ return res;
+ }
+}
Added: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml
===================================================================
--- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml (rev 0)
+++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws3026/WEB-INF/web.xml 2010-12-08 13:43:00 UTC (rev 13429)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <servlet>
+ <servlet-name>MyService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3026.MyServiceImpl</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>MyService</servlet-name>
+ <url-pattern>/MyService</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
13 years, 5 months
- 1
- 0
JBossWS SVN: r13428 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-08 06:00:53 -0500 (Wed, 08 Dec 2010)
New Revision: 13428
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3168] switch CXF 2.3.0 -> 2.3.1
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-12-08 10:59:33 UTC (rev 13427)
+++ stack/cxf/trunk/pom.xml 2010-12-08 11:00:53 UTC (rev 13428)
@@ -58,7 +58,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.3.1-SNAPSHOT</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version>
13 years, 5 months
- 1
- 0
JBossWS SVN: r13427 - stack/cxf/branches/jbossws-cxf-3.4.1.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-08 05:59:33 -0500 (Wed, 08 Dec 2010)
New Revision: 13427
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
Log:
[JBWS-3168] switch CXF 3.4.0 -> 3.4.1
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-08 10:59:33 UTC (rev 13427)
@@ -58,7 +58,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.3.1-SNAPSHOT</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version>
13 years, 5 months
- 1
- 0
JBossWS SVN: r13426 - in stack/cxf/branches/jbossws-cxf-3.4.1: modules/addons and 13 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-12-06 11:37:13 -0500 (Mon, 06 Dec 2010)
New Revision: 13426
Added:
stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml
Log:
prepare for next dev. cycle
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/addons/transports/http/httpserver/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Copied: stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (from rev 13420, stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-12-06 16:37:13 UTC (rev 13426)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.cxf.saaj.SOAPConnectionFactoryImpl
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/endorsed/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/management/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -46,6 +46,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510</artifactId>
<scope>provided</scope>
<exclusions>
@@ -59,6 +64,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/resources/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-12-06 16:37:13 UTC (rev 13426)
@@ -35,6 +35,7 @@
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -101,6 +102,13 @@
endpoint.setServiceName(dde.getServiceName());
endpoint.setWsdlLocation(dde.getWsdlLocation());
setHandlers(endpoint, dde.getHandlers());
+ if (dde.isAddressingEnabled())
+ {
+ WSAddressingFeature addressingFeature = new WSAddressingFeature();
+ addressingFeature.setAddressingRequired(dde.isAddressingRequired());
+ addressingFeature.setResponses(dde.getAddressingResponses());
+ endpoint.getFeatures().add(addressingFeature);
+ }
endpoint.publish();
endpoints.add(endpoint);
if (dde.isMtomEnabled())
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-spring-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/cxf-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/framework-tests/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/modules/testsuite/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/pom.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>3.4.1.CR1</version>
+ <version>3.4.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.4.1...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
</scm>
<!-- Modules -->
@@ -46,11 +46,11 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.4.1.CR4</jbossws.spi.version>
- <jbossws.common.version>1.4.1.CR4</jbossws.common.version>
- <jbossws.framework.version>3.4.1.CR1</jbossws.framework.version>
- <jbossws.jboss501.version>3.4.0.Beta2</jbossws.jboss501.version>
- <jbossws.jboss510.version>3.4.0.Beta2</jbossws.jboss510.version>
+ <jbossws.spi.version>1.4.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.4.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>3.4.1-SNAPSHOT</jbossws.framework.version>
+ <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -58,7 +58,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.3.0</cxf.version>
+ <cxf.version>2.3.1-SNAPSHOT</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version>
@@ -127,6 +127,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501-metadata</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
<version>${jbossws.jboss501.version}</version>
<classifier>resources</classifier>
@@ -139,6 +144,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510-metadata</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510</artifactId>
<version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml 2010-12-06 16:31:04 UTC (rev 13425)
+++ stack/cxf/branches/jbossws-cxf-3.4.1/src/main/scripts/assembly-deploy-artifacts.xml 2010-12-06 16:37:13 UTC (rev 13426)
@@ -142,6 +142,16 @@
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -150,6 +160,16 @@
<include>org.jboss.ws:jbossws-jboss510:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include>
+ </includes>
+ </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
13 years, 5 months
- 1
- 0