geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r747480 - in /geronimo/server/branches/2.1: ./ plugins/procrun/ testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/ testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/a...
Date Tue, 24 Feb 2009 18:38:57 GMT
Author: dblevins
Date: Tue Feb 24 18:38:56 2009
New Revision: 747480

URL: http://svn.apache.org/viewvc?rev=747480&view=rev
Log:
Merging r695597 - http://svn.apache.org/viewvc?rev=695597&view=rev

svn merge -r 695596:695597 https://svn.apache.org/repos/asf/geronimo/server/trunk .

------------------------------------------------------------------------
r695597 | gawor | 2008-09-15 12:54:10 -0700 (Mon, 15 Sep 2008) | 1 line

jndi-name override in openejb-jar.xml is working now
------------------------------------------------------------------------

Modified:
    geronimo/server/branches/2.1/   (props changed)
    geronimo/server/branches/2.1/plugins/procrun/   (props changed)
    geronimo/server/branches/2.1/plugins/procrun/LICENSE.txt   (props changed)
    geronimo/server/branches/2.1/plugins/procrun/NOTICE.txt   (props changed)
    geronimo/server/branches/2.1/plugins/procrun/README.txt   (props changed)
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXBTest.java
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBStaxTest.java

Propchange: geronimo/server/branches/2.1/
------------------------------------------------------------------------------
    svn:mergeinfo = /geronimo/server/trunk:695597

Propchange: geronimo/server/branches/2.1/plugins/procrun/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/branches/2.1/plugins/procrun/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/branches/2.1/plugins/procrun/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/branches/2.1/plugins/procrun/README.txt
            ('svn:mergeinfo' removed)

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXBTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXBTest.java?rev=747480&r1=747479&r2=747480&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXBTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXBTest.java
Tue Feb 24 18:38:56 2009
@@ -42,7 +42,7 @@
         
         InitialContext ctx = new InitialContext(p);
         
-        Object obj = ctx.lookup("/JAXBRemoteHome");
+        Object obj = ctx.lookup("/JAXB");
 
         JAXBHome ejbHome = 
             (JAXBHome)PortableRemoteObject.narrow(obj, JAXBHome.class);

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java?rev=747480&r1=747479&r2=747480&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
Tue Feb 24 18:38:56 2009
@@ -42,7 +42,7 @@
         
         InitialContext ctx = new InitialContext(p);
         
-        Object obj = ctx.lookup("/JAXRRemoteHome");
+        Object obj = ctx.lookup("/JAXR");
         
         JAXRHome ejbHome = 
             (JAXRHome)PortableRemoteObject.narrow(obj, JAXRHome.class);

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java?rev=747480&r1=747479&r2=747480&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
Tue Feb 24 18:38:56 2009
@@ -164,7 +164,7 @@
         
         InitialContext ctx = new InitialContext(p);
         
-        Object obj = ctx.lookup("/GreeterRemoteHome");
+        Object obj = ctx.lookup("/Greeter");
         
         GreeterHome ejbHome = 
             (GreeterHome)PortableRemoteObject.narrow(obj, GreeterHome.class);

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBStaxTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBStaxTest.java?rev=747480&r1=747479&r2=747480&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBStaxTest.java
(original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBStaxTest.java
Tue Feb 24 18:38:56 2009
@@ -42,7 +42,7 @@
         
         InitialContext ctx = new InitialContext(p);
         
-        Object obj = ctx.lookup("/StaxRemoteHome");
+        Object obj = ctx.lookup("/Stax");
         
         StaxHome ejbHome = 
             (StaxHome)PortableRemoteObject.narrow(obj, StaxHome.class);



Mime
View raw message