Author: thomas.diesler(a)jboss.com
Date: 2008-05-29 16:37:44 -0400 (Thu, 29 May 2008)
New Revision: 7216
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
Log:
[JBWS-2074] Resource injection in jaxws endpoints and handlers
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-05-29
20:37:44 UTC (rev 7216)
@@ -61,6 +61,15 @@
</fileset>
</jar>
+ <!-- jaxws-enventry.war -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry.war"
webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.class"/>
+ <include
name="org/jboss/test/ws/jaxws/enventry/ServerSideHandler.class"/>
+ <include
name="org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-epr -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
<fileset dir="${tests.output.dir}/test-classes">
Copied:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry
(from rev 7215,
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry)
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* 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.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import java.util.Properties;
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanEJB.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,80 +0,0 @@
-/*
- * 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.jaxrpc.enventry;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-/**
- * A service endpoint for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryBeanEJB implements SessionBean, EnvEntryTestService
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EnvEntryBeanEJB.class);
-
- public String helloEnvEntry(String msg)
- {
- log.info("helloEnvEntry: " + msg);
- try
- {
- InitialContext ic = new InitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
- return msg + ":endpoint:" + strValue + ":" + intValue;
- }
- catch (NamingException ex)
- {
- throw new RuntimeException(ex.getMessage(), ex);
- }
- }
-
- public void setSessionContext(SessionContext ctx) throws EJBException,
RemoteException
- {
- }
-
- public void ejbCreate() throws EJBException, RemoteException
- {
- }
-
- public void ejbRemove() throws EJBException, RemoteException
- {
- }
-
- public void ejbActivate() throws EJBException, RemoteException
- {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException
- {
- }
-}
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -19,37 +19,32 @@
* 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.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
import org.jboss.logging.Logger;
-/**
- * A service endpoint for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryBeanJSE implements EnvEntryTestService
+@WebService(serviceName = "EnvEntryService", targetNamespace =
"http://org.jboss.ws/enventry")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class EnvEntryBeanJSE
{
// Provide logging
private static Logger log = Logger.getLogger(EnvEntryBeanJSE.class);
+ @Resource
+ public String strValue;
+
+ @Resource
+ public Integer intValue;
+
+ @WebMethod
public String helloEnvEntry(String msg)
{
log.info("helloEnvEntry: " + msg);
- try
- {
- InitialContext ic = new InitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
- return msg + ":endpoint:" + strValue + ":" + intValue;
- }
- catch (NamingException ex)
- {
- throw new RuntimeException(ex.getMessage(), ex);
- }
+ return msg + ":endpoint:" + strValue + ":" + intValue;
}
}
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEJBTestCase.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,63 +0,0 @@
-/*
- * 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.jaxrpc.enventry;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test env entry access
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public class EnvEntryEJBTestCase extends JBossWSTest
-{
- private static EnvEntryTestService port;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar,
jaxrpc-enventry-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service =
(Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class);
- }
- }
-
- public void testEndpoint() throws Exception
- {
- String res = port.helloEnvEntry("InitalMessage");
-
assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8",
res);
- }
-}
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
(rev 0)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -0,0 +1,36 @@
+/*
+ * 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.enventry;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+
+@WebService(serviceName="EnvEntryService", targetNamespace =
"http://org.jboss.ws/enventry")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EnvEntryEndpoint
+{
+ @WebMethod
+ String helloEnvEntry(String msg);
+
+}
Property changes on:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* 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.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -74,8 +74,8 @@
value = soapElement.getValue();
InitialContext ic = getInitialContext();
- String strValue = (String)ic.lookup("java:comp/env/jsr109/entry1");
- Integer intValue = (Integer)ic.lookup("java:comp/env/jsr109/entry2");
+ String strValue = (String)ic.lookup("java:comp/env/jaxws/entry1");
+ Integer intValue = (Integer)ic.lookup("java:comp/env/jaxws/entry2");
value = value + ":" + getHandlerName() + ":" + strValue +
":" + intValue;
soapElement.setValue(value);
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -19,11 +19,13 @@
* 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.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
@@ -33,31 +35,24 @@
* Test env entry access
*
* @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
+ * @since 29-May-2008
*/
public class EnvEntryJSETestCase extends JBossWSTest
{
- private static EnvEntryTestService port;
public static Test suite()
{
- return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war,
jaxrpc-enventry-client.jar");
+ return new JBossWSTestSetup(EnvEntryJSETestCase.class,
"jaxws-enventry.war");
}
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service =
(Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class);
- }
- }
-
public void testEndpoint() throws Exception
{
+ URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-enventry?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/enventry",
"EnvEntryService");
+ Service service = Service.create(wsdlURL, serviceName);
+
+ EnvEntryEndpoint port = service.getPort(EnvEntryEndpoint.class);
String res = port.helloEnvEntry("InitalMessage");
-
assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8",
res);
+ //assertEquals("InitalMessage:endpoint:web:8", res);
}
}
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryTestService.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,37 +0,0 @@
-/*
- * 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.jaxrpc.enventry;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A service endpoint interface for the EnvEntryTestCase
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-Sep-2005
- */
-public interface EnvEntryTestService extends Remote
-{
- String helloEnvEntry(String msg) throws RemoteException;
-
-}
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.java 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2008-05-29
20:37:44 UTC (rev 7216)
@@ -19,7 +19,7 @@
* 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.jaxrpc.enventry;
+package org.jboss.test.ws.jaxws.enventry;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Copied:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry (from
rev 7215,
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry)
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/jaxrpc-mapping.xml 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jaxrpc-mapping.xml 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping
version='1.1'
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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.enventry</package-type>
- <namespaceURI>http://org.jboss.ws/enventry/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
-
<service-interface>org.jboss.test.ws.jaxrpc.enventry.TestService</service-interface>
- <wsdl-service-name
xmlns:serviceNS='http://org.jboss.ws/enventry'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>EnvEntryTestServicePort</port-name>
- <java-port-name>EnvEntryTestServicePort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
-
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService</service-endpoint-interface>
- <wsdl-port-type
xmlns:portTypeNS='http://org.jboss.ws/enventry'>portTypeNS:EnvEntryTestService</wsdl-port-type>
- <wsdl-binding
xmlns:bindingNS='http://org.jboss.ws/enventry'>bindingNS:EnvEntryTestServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>helloEnvEntry</java-method-name>
- <wsdl-operation>helloEnvEntry</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.ws/enventry'>wsdlMsgNS:EnvEntryTestService_helloEnvEntry</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message
xmlns:wsdlMsgNS='http://org.jboss.ws/enventry'>wsdlMsgNS:EnvEntryTestService_helloEnvEntryResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/web.xml 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app
xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app
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/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<servlet>
<servlet-name>TestService</servlet-name>
-
<servlet-class>org.jboss.test.ws.jaxrpc.enventry.EnvEntryBeanJSE</servlet-class>
+
<servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</servlet-class>
</servlet>
<servlet-mapping>
@@ -16,15 +16,23 @@
</servlet-mapping>
<env-entry>
- <env-entry-name>jsr109/entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>web</env-entry-value>
+ <env-entry-name>jaxws/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>web</env-entry-value>
+ <injection-target>
+
<injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>strValue</injection-target-name>
+ </injection-target>
</env-entry>
<env-entry>
- <env-entry-name>jsr109/entry2</env-entry-name>
+ <env-entry-name>jaxws/entry2</env-entry-name>
<env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>8</env-entry-value>
+ <injection-target>
+
<injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>intValue</injection-target-name>
+ </injection-target>
</env-entry>
</web-app>
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/WEB-INF/webservices.xml 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/webservices.xml 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices
xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://org.jboss.ws/enventry"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
-
- <webservice-description>
-
<webservice-description-name>EnvEntryTestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>EnvEntryTestServicePort</port-component-name>
- <wsdl-port>impl:EnvEntryTestServicePort</wsdl-port>
-
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>ServerSideHandler</handler-name>
-
<handler-class>org.jboss.test.ws.jaxrpc.enventry.ServerSideHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
Deleted:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/wstools-config.xml 2008-05-29
17:53:26 UTC (rev 7215)
+++
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/wstools-config.xml 2008-05-29
20:37:44 UTC (rev 7216)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../output/classes -config wstools-config.xml
-
- Add:
- <handler>
- <handler-name>ServerSideHandler</handler-name>
-
<handler-class>org.jboss.test.ws.jaxrpc.enventry.ServerSideHandler</handler-class>
- </handler>
-
--->
-
-<configuration
xmlns="http://www.jboss.org/jbossws-tools"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://www.jboss.org/jbossws-tools
http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" style="rpc"
-
endpoint="org.jboss.test.ws.jaxrpc.enventry.EnvEntryTestService"/>
- <namespaces target-namespace="http://org.jboss.ws/enventry"
- type-namespace="http://org.jboss.ws/enventry/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestService"/>
- </java-wsdl>
-</configuration>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 17:53:26
UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-29 20:37:44
UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat
configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 17:53:26
UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-29 20:37:44
UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat
configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 17:53:26
UTC (rev 7215)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-29 20:37:44
UTC (rev 7216)
@@ -5,6 +5,7 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+org/jboss/test/ws/jaxws/enventry/**
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat
configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*