geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r672691 - in /geronimo/server/trunk/plugins: client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java j2ee/j2ee-deployer/pom.xml
Date Mon, 30 Jun 2008 02:33:02 GMT
Author: gawor
Date: Sun Jun 29 19:33:01 2008
New Revision: 672691

URL: http://svn.apache.org/viewvc?rev=672691&view=rev
Log:
xbean updates

Modified:
    geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml

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=672691&r1=672690&r2=672691&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
Sun Jun 29 19:33:01 2008
@@ -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());
@@ -170,7 +170,7 @@
                     throw new Exception("Some objects to be injected were not found in jndi:
" + problems);
                 }
             }
-            Class clazz = objectRecipe.setStaticProperties(classLoader);
+            Class clazz = objectRecipe.setStaticProperties();
             if (holder.getPostConstruct() != null) {
                 Holder.apply(null, clazz, holder.getPostConstruct());
             }

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=672691&r1=672690&r2=672691&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Sun Jun 29 19:33:01 2008
@@ -211,7 +211,7 @@
                         <dependency>
                             <groupId>org.apache.xbean</groupId>
                             <artifactId>xbean-finder</artifactId>
-                            <version>3.3</version>
+                            <version>3.4.1</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>



Mime
View raw message