geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r929757 - in /geronimo/server/trunk/plugins/client: client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
Date Thu, 01 Apr 2010 00:30:55 GMT
Author: djencks
Date: Thu Apr  1 00:30:55 2010
New Revision: 929757

URL: http://svn.apache.org/viewvc?rev=929757&view=rev
Log:
GERONIMO-4934 enable openejb remote jndi, fix a lookup glitch in app client container

Modified:
    geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
    geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java

Modified: geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml?rev=929757&r1=929756&r2=929757&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
(original)
+++ geronimo/server/trunk/plugins/client/client/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
Thu Apr  1 00:30:55 2010
@@ -72,5 +72,9 @@ limitations under the License.
         <bean class="com.sun.jndi.url.rmi.rmiURLContextFactory"/>
     </service>
 
+    <service id="OpenEJBInitialContextFactory"
+             interface="org.apache.openejb.client.RemoteInitialContextFactory">
+        <bean class="org.apache.openejb.client.RemoteInitialContextFactory"/>
+    </service>
 
 </blueprint>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?rev=929757&r1=929756&r2=929757&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
Thu Apr  1 00:30:55 2010
@@ -152,8 +152,9 @@ public final class AppClientContainer im
                 for (Injection injection : injections) {
                     try {
                         String jndiName = injection.getJndiName();
-                        //our componentContext is attached to jndi at "java:comp" so we remove
that when looking stuff up in it
-                        Object object = componentContext.lookup("env/" + jndiName);
+                        //TODO this may not be correct due to module, app, and global jndi
names.
+                        //our componentContext is attached to jndi at "java:" so we remove
that when looking stuff up in it
+                        Object object = componentContext.lookup("comp/env/" + jndiName);
                         if (object instanceof String) {
                             String string = (String) object;
                             // Pass it in raw so it could be potentially converted to



Mime
View raw message