geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r547105 - in /geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src: main/java/org/apache/geronimo/test/ main/resources/META-INF/ test/java/org/apache/geronimo/testsuite/testset/
Date Thu, 14 Jun 2007 03:57:49 GMT
Author: gawor
Date: Wed Jun 13 20:57:48 2007
New Revision: 547105

URL: http://svn.apache.org/viewvc?view=rev&rev=547105
Log:
fix ejb test

Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java?view=diff&rev=547105&r1=547104&r2=547105
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
Wed Jun 13 20:57:48 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.geronimo.test;
 
+import javax.ejb.Remote;
 import javax.ejb.Stateless;
 import javax.jws.WebService;
 import javax.jws.HandlerChain;
@@ -25,6 +26,7 @@
 
 @WebService
 @Stateless(mappedName="JAXWSBean")
+@Remote(JAXWSGreeter.class)
 @HandlerChain(file="handlers.xml")
 @SOAPBinding(style=SOAPBinding.Style.RPC, 
              use=SOAPBinding.Use.LITERAL,

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java?view=diff&rev=547105&r1=547104&r2=547105
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
Wed Jun 13 20:57:48 2007
@@ -18,9 +18,6 @@
  */
 package org.apache.geronimo.test;
 
-import javax.ejb.Remote;
-
-@Remote 
 public interface JAXWSGreeter { 
 
     public String greetMe(String me);

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=547105&r1=547104&r2=547105
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/ejb-jar.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/ejb-jar.xml
Wed Jun 13 20:57:48 2007
@@ -5,7 +5,6 @@
     <session>
       <display-name>JAXWSBean</display-name>
       <ejb-name>JAXWSBean</ejb-name>
-      <service-endpoint>org.apache.geronimo.test.JAXWSGreeter</service-endpoint>
       <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
       <session-type>Stateless</session-type>
       <transaction-type>Container</transaction-type>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=547105&r1=547104&r2=547105
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/openejb-jar.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/resources/META-INF/openejb-jar.xml
Wed Jun 13 20:57:48 2007
@@ -20,7 +20,7 @@
 <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
   xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
   xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+  xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <environment>
         <moduleId>
@@ -30,13 +30,5 @@
             <type>car</type>
         </moduleId>
    </environment>
-
- <enterprise-beans>
-    <session>
-      <ejb-name>JAXWSBean</ejb-name>
-      <jndi-name>JAXWSBean</jndi-name>
-    </session>
-  </enterprise-beans>
-
 
 </openejb-jar>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java?view=diff&rev=547105&r1=547104&r2=547105
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
Wed Jun 13 20:57:48 2007
@@ -176,17 +176,17 @@
         p.put("java.naming.factory.initial", 
               "org.apache.openejb.client.RemoteInitialContextFactory");
         p.put("java.naming.provider.url", 
-              "127.0.0.1:4201");
-        p.put("java.naming.security.principal", 
-              "myuser");
-        p.put("java.naming.security.credentials", 
-              "mypass");    
+              "127.0.0.1:4201");   
         
         InitialContext ctx = new InitialContext(p);
         
-        JAXWSGreeter greeter = (JAXWSGreeter)ctx.lookup("JAXWSBean");
+        JAXWSGreeter greeter = (JAXWSGreeter)ctx.lookup("JAXWSEJB/JAXWSBean/org.apache.geronimo.test.JAXWSGreeter");
         
-        System.out.println( greeter );
+        String response = greeter.greetMe("foo bar");
+        
+        System.out.println(response);
+        
+        assertEquals("Hello foo bar", response);
     }
 
 }



Mime
View raw message