geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r740985 - in /geronimo/server/branches/2.0/modules: geronimo-client/src/main/java/org/apache/geronimo/client/ geronimo-naming/src/test/java/org/apache/geronimo/gjndi/ geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deploy...
Date Thu, 05 Feb 2009 03:19:24 GMT
Author: jaydm
Date: Thu Feb  5 03:19:24 2009
New Revision: 740985

URL: http://svn.apache.org/viewvc?rev=740985&view=rev
Log:
GERONIMO-4527 - This is the second half of the changes necessary to switch
over to using OpenEJB 3.0.1-SNAPSHOT.  These are the changes necessary to
get the integration tests to pass again.

Modified:
    geronimo/server/branches/2.0/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
    geronimo/server/branches/2.0/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java
    geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

Modified: geronimo/server/branches/2.0/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?rev=740985&r1=740984&r2=740985&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
Thu Feb  5 03:19:24 2009
@@ -134,11 +134,11 @@
                 clientSubject = loginContext.getSubject();
             }
             ContextManager.setCallers(clientSubject, clientSubject);
-            ObjectRecipe objectRecipe = new ObjectRecipe(mainClassName);
+            Class mainClass = classLoader.loadClass(mainClassName);
+            ObjectRecipe objectRecipe = new ObjectRecipe(mainClass);
             objectRecipe.allow(Option.FIELD_INJECTION);
             objectRecipe.allow(Option.PRIVATE_PROPERTIES);
             objectRecipe.allow(Option.STATIC_PROPERTIES);
-            Class mainClass = classLoader.loadClass(mainClassName);
             List<Injection> injections = new ArrayList<Injection>();
             while (mainClass != null && mainClass != Object.class) {
                 List<Injection> perClass = holder.getInjections(mainClass.getName());

Modified: geronimo/server/branches/2.0/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java?rev=740985&r1=740984&r2=740985&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java
Thu Feb  5 03:19:24 2009
@@ -195,7 +195,7 @@
         RootContext.setComponentContext(readOnlyContext);
 
         Context javaCompContext = new JavaCompContextGBean();
-        Context globalContext = new ImmutableContext(Collections.singletonMap(javaCompContext.getNameInNamespace(),
javaCompContext));
+        Context globalContext = new ImmutableContext(Collections.<String, Object>singletonMap(javaCompContext.getNameInNamespace(),
javaCompContext));
         GlobalContextManager.setGlobalContext(globalContext);
 
         initialContext = new InitialContext();

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=740985&r1=740984&r2=740985&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Thu Feb  5 03:19:24 2009
@@ -290,11 +290,11 @@
 
             // create the ejb-ref
             EjbLocalRef ref = new EjbLocalRef();
-            jndiConsumer.getEjbLocalRef().add(ref);
-
             // ejb-ref-name
             ref.setEjbRefName(refName);
 
+            jndiConsumer.getEjbLocalRef().add(ref);
+
             // ejb-ref-type
             String refType = getStringValue(xmlbeansRef.getEjbRefType());
             if ("SESSION".equalsIgnoreCase(refType)) {



Mime
View raw message