[jbossws-commits] JBossWS SVN: r9978 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2634 and 5 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed May 6 06:49:48 EDT 2009


Author: richard.opalka at jboss.com
Date: 2009-05-06 06:49:48 -0400 (Wed, 06 May 2009)
New Revision: 9978

Added:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml
   framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/ejb-jar.xml
Removed:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOIface.java
Modified:
   framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java
   framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/application.xml
   framework/trunk/testsuite/test/resources/jaxws/jbws2634/WEB-INF/web.xml
Log:
[JBWS-2634] extending test to cover all usecases

Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml	2009-05-06 10:49:48 UTC (rev 9978)
@@ -735,17 +735,33 @@
         <include name="org/jboss/test/ws/jaxws/jbws2634/shared/*.class"/>
       </fileset>
     </jar>
-    <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634.war" 
+    <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" 
       webxml="${tests.output.dir}/test-resources/jaxws/jbws2634/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.class"/>
-        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOIface.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml"/>
       </classes>
     </war>
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml"/>
+      </fileset>
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF">
+        <include name="ejb-jar.xml"/>
+      </metainf>
+    </jar>
     <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF/application.xml"
       earfile="${tests.output.dir}/test-libs/jaxws-jbws2634.ear">
       <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634.jar"/>
-      <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634.war"/>
+      <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar"/>
+      <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war"/>
     </ear>
 
     <!-- jaxws namespace -->

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -28,7 +28,7 @@
 
 import junit.framework.Test;
 
-import org.jboss.test.ws.jaxws.jbws2634.webservice.POJOIface;
+import org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface;
 import org.jboss.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestSetup;
 
@@ -44,13 +44,23 @@
       return new JBossWSTestSetup(JBWS2634TestCase.class, "jaxws-jbws2634.ear");
    }
 
-   public void testInjection() throws Exception
+   public void testPojoEndpointInjection() throws Exception
    {
-      QName serviceName = new QName("http://jbossws.org/JBWS2634", "EndpointService");
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2634/Service?wsdl");
+      QName serviceName = new QName("http://jbossws.org/JBWS2634", "POJOService");
+      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2634-pojo/POJOService?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);
-      POJOIface proxy = (POJOIface)service.getPort(POJOIface.class);
-      assertEquals(proxy.getMessage(), "Injected hello message");
+      EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class);
+      assertEquals("Hello World!:Inbound:TestHandler:POJOBean:Outbound:TestHandler", proxy.echo("Hello World!"));
    }
+
+   public void testEjb3EndpointInjection() throws Exception
+   {
+      QName serviceName = new QName("http://jbossws.org/JBWS2634", "EJB3Service");
+      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2634-ejb3/EJB3Service?wsdl");
+
+      Service service = Service.create(wsdlURL, serviceName);
+      EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class);
+      assertEquals("Hello World!:Inbound:TestHandler:EJB3Bean:Outbound:TestHandler", proxy.echo("Hello World!"));
+   }
 }

Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2634.shared.handlers;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface;
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+
+/**
+ * This handler is initialized via injections.
+ *
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
+ */
+public final class TestHandler extends GenericSOAPHandler
+{
+   // provide logging
+   private static final Logger log = Logger.getLogger(TestHandler.class);
+
+   @Resource
+   private Boolean boolean1;
+
+   @EJB
+   private BeanIface bean1;
+
+   /**
+    * Indicates whether handler is in correct state.
+    */
+   private boolean correctState;
+
+   @PostConstruct
+   private void init()
+   {
+      boolean correctInitialization = true;
+
+      // verify @Resource annotation driven injection
+      if (this.boolean1 == null || this.boolean1 != true)
+      {
+         log.error("Annotation driven initialization for boolean1 failed");
+         correctInitialization = false;
+      }
+      // verify @EJB annotation driven injection
+      if (this.bean1 == null || !this.bean1.printString().equals("Injected hello message"))
+      {
+         log.error("Annotation driven initialization for bean1 failed");
+         correctInitialization = false;
+      }
+
+      this.correctState = correctInitialization;
+   }
+
+   @Override
+   public boolean handleOutbound(MessageContext msgContext)
+   {
+      return ensureInjectionsAndInitialization(msgContext, "Outbound");
+   }
+
+   @Override
+   public boolean handleInbound(MessageContext msgContext)
+   {
+      return ensureInjectionsAndInitialization(msgContext, "Inbound");
+   }
+
+   private boolean ensureInjectionsAndInitialization(MessageContext msgContext, String direction)
+   {
+      if (!this.correctState)
+      {
+         throw new WebServiceException("Unfunctional injections");
+      }
+
+      try
+      {
+         SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+         SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+         soapElement = (SOAPElement)soapElement.getChildElements().next();
+
+         String oldValue = soapElement.getValue();
+         String newValue = oldValue + ":" + direction + ":TestHandler";
+         soapElement.setValue(newValue);
+
+         log.debug("oldValue: " + oldValue);
+         log.debug("newValue: " + newValue);
+
+         return true;
+      }
+      catch (SOAPException ex)
+      {
+         throw new WebServiceException(ex);
+      }
+   }
+
+}

Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2634.webservice;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface;
+
+/**
+ * Basic endpoint implementation.
+ *
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
+ */
+public abstract class AbstractEndpointImpl implements EndpointIface
+{
+
+   private static final Logger LOG = Logger.getLogger(AbstractEndpointImpl.class);
+
+   private boolean correctState;
+   @EJB
+   private BeanIface testBean2;
+
+   private BeanIface testBean1;
+
+   @EJB(name = "jaxws-jbws2634/BeanImpl/local-org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface")
+   private void setBean(BeanIface bean)
+   {
+      this.testBean1 = bean;
+   }
+
+   private Boolean boolean1;
+
+   /**
+    * EJB 3.0 16.2.2: "By default, the name of the field is combined with the
+    * name of the class in which the annotation is used and is used directly
+    * as the name in the bean’s naming context
+    */
+   @Resource(name="boolean1")
+   private void setBoolean1(Boolean b)
+   {
+      this.boolean1 = b;
+   }
+
+   public String echo(final String msg)
+   {
+      if (!this.correctState)
+      {
+         throw new WebServiceException("Injection failed");
+      }
+
+      LOG.info("echo: " + msg);
+      return msg;
+   }
+
+   @PostConstruct
+   private void init()
+   {
+      boolean currentState = true;
+
+      if (this.testBean1 == null)
+      {
+         LOG.error("Annotation driven initialization for testBean1 failed");
+         currentState = false;
+      }
+      if (!"Injected hello message".equals(testBean1.printString())) 
+      {
+         LOG.error("Annotation driven initialization for testBean1 failed");
+         currentState = false;
+      }
+      if (this.testBean2 == null)
+      {
+         LOG.error("Annotation driven initialization for testBean2 failed");
+         currentState = false;
+      }
+      if (!"Injected hello message".equals(testBean2.printString())) 
+      {
+         LOG.error("Annotation driven initialization for testBean2 failed");
+         currentState = false;
+      }
+      if (this.boolean1 == null || this.boolean1 != true)
+      {
+         LOG.error("Annotation driven initialization for boolean1 failed");
+         currentState = false;
+      }
+
+      this.correctState = currentState;
+   }
+
+}

Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2634.webservice;
+
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * EJB3 bean published as WebService injecting other EJB3 bean.
+ *
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
+ */
+ at WebService
+(
+   name="EJB3",
+   serviceName = "EJB3Service", 
+   targetNamespace = "http://jbossws.org/JBWS2634", 
+   endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface"
+)
+ at HandlerChain(file = "jaxws-handler.xml")
+ at Stateless
+ at WebContext
+(
+   urlPattern = "/EJB3Service",
+   contextRoot = "/jaxws-jbws2634-ejb3"
+)
+public class EJB3Bean extends AbstractEndpointImpl
+{
+
+   public String echo(String msg)
+   {
+      return super.echo(msg) + ":EJB3Bean";
+   }
+
+}

Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.java	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2634.webservice;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * An endpoint interface.
+ *
+ * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
+ */
+ at WebService
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointIface
+{
+   @WebMethod
+   String echo(String s);
+}

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -21,62 +21,28 @@
  */
 package org.jboss.test.ws.jaxws.jbws2634.webservice;
 
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
+import javax.jws.HandlerChain;
 import javax.jws.WebService;
-import javax.xml.ws.WebServiceException;
 
-import org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface;
-
 /**
- * POJO bean published as WebService injecting other EJB3 bean
+ * POJO bean published as WebService injecting other EJB3 bean.
  *
  * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
  */
 @WebService
 (
-   serviceName = "EndpointService", 
+   name="POJO",
+   serviceName = "POJOService", 
    targetNamespace = "http://jbossws.org/JBWS2634", 
-   endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.POJOIface"
+   endpointInterface="org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface"
 )
-public class POJOBean implements POJOIface
+ at HandlerChain(file = "jaxws-handler.xml")
+public class POJOBean extends AbstractEndpointImpl
 {
 
-   private boolean correctState;
-   @EJB
-   private BeanIface testBean2;
-
-   private BeanIface testBean1;
-   
-   @EJB(name = "jaxws-jbws2634/BeanImpl/local-org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface")
-   private void setBean(BeanIface bean)
+   public String echo(String msg)
    {
-      this.testBean1 = bean;
+      return super.echo(msg) + ":POJOBean";
    }
 
-   public String getMessage()
-   {
-      if (this.correctState)
-      {
-         return this.testBean2.printString();
-      }
-
-      throw new WebServiceException("@EJB reference injection failed!");
-   }
-   
-   @PostConstruct
-   private void init()
-   {
-      if (this.testBean1 == null)
-         return;
-      if (!"Injected hello message".equals(testBean1.printString())) 
-         return;
-      if (this.testBean2 == null)
-         return;
-      if (!"Injected hello message".equals(testBean2.printString())) 
-         return;
-      
-      this.correctState = true;
-   }
-   
 }

Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOIface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOIface.java	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOIface.java	2009-05-06 10:49:48 UTC (rev 9978)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.jbws2634.webservice;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- * A POJO endpoint interface
- *
- * @author <a href="mailto:richard.opalka at jboss.org">Richard Opalka</a>
- */
- at WebService
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface POJOIface
-{
-   @WebMethod
-   String getMessage();
-}

Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml	                        (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+  <handler-chain>
+    <handler>
+      <handler-name>TestHandler</handler-name>
+      <handler-class>org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler</handler-class>
+    </handler>
+  </handler-chain>
+
+</handler-chains>
\ No newline at end of file

Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/application.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/application.xml	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/application.xml	2009-05-06 10:49:48 UTC (rev 9978)
@@ -12,9 +12,13 @@
   </module>
 
   <module>
+    <ejb>jaxws-jbws2634-ejb3.jar</ejb>
+  </module>
+
+  <module>
     <web>
-      <web-uri>jaxws-jbws2634.war</web-uri>
-      <context-root>/jaxws-jbws2634</context-root>
+      <web-uri>jaxws-jbws2634-pojo.war</web-uri>
+      <context-root>/jaxws-jbws2634-pojo</context-root>
     </web>
   </module>
 

Added: framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/ejb-jar.xml	                        (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2634/META-INF/ejb-jar.xml	2009-05-06 10:49:48 UTC (rev 9978)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+
+  <enterprise-beans>
+    <session>
+
+      <ejb-name>EJB3Bean</ejb-name>
+      <ejb-class>org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean</ejb-class>
+
+      <env-entry>
+        <env-entry-name>boolean1</env-entry-name>
+        <env-entry-type>java.lang.Boolean</env-entry-type>
+        <env-entry-value>true</env-entry-value>
+      </env-entry>
+
+    </session>
+
+  </enterprise-beans>
+
+</ejb-jar>

Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2634/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2634/WEB-INF/web.xml	2009-05-06 09:27:16 UTC (rev 9977)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2634/WEB-INF/web.xml	2009-05-06 10:49:48 UTC (rev 9978)
@@ -6,13 +6,19 @@
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
   <servlet>
-    <servlet-name>Service</servlet-name>
+    <servlet-name>POJOService</servlet-name>
     <servlet-class>org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean</servlet-class>
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>Service</servlet-name>
-    <url-pattern>/Service</url-pattern>
+    <servlet-name>POJOService</servlet-name>
+    <url-pattern>/POJOService</url-pattern>
   </servlet-mapping>
 
+  <env-entry>
+     <env-entry-name>boolean1</env-entry-name>
+     <env-entry-type>java.lang.Boolean</env-entry-type>
+     <env-entry-value>true</env-entry-value>
+  </env-entry>
+
 </web-app>




More information about the jbossws-commits mailing list