geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r747481 - in /geronimo/server/branches/2.1: ./ testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java
Date Tue, 24 Feb 2009 18:39:34 GMT
Author: dblevins
Date: Tue Feb 24 18:39:34 2009
New Revision: 747481

URL: http://svn.apache.org/viewvc?rev=747481&view=rev
Log:
Merging r695602 - http://svn.apache.org/viewvc?rev=695602&view=rev

svn merge -r 695601:695602 https://svn.apache.org/repos/asf/geronimo/server/trunk .

------------------------------------------------------------------------
r695602 | gawor | 2008-09-15 13:08:25 -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/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java

Propchange: geronimo/server/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 18:39:34 2009
@@ -1 +1 @@
-/geronimo/server/trunk:695597
+/geronimo/server/trunk:695597,695602

Modified: geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java?rev=747481&r1=747480&r2=747481&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java
(original)
+++ geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestMEJBSecurity.java
Tue Feb 24 18:39:34 2009
@@ -114,7 +114,7 @@
     }
     
     protected Management getMEJB(Hashtable env) throws Exception { 
-        String jndiName = "ejb/mgmt/MEJBRemoteHome"; // should be "ejb/mgmt/MEJB"
+        String jndiName = "ejb/mgmt/MEJB";
         InitialContext ctx = new InitialContext(env);
         Object objref = ctx.lookup(jndiName);
         ManagementHome home = (ManagementHome)



Mime
View raw message