Return-Path: 
 <scm-return-29702-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 62854 invoked from network); 30 Jun 2008 02:33:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Jun 2008 02:33:53 -0000
Received: (qmail 14495 invoked by uid 500); 30 Jun 2008 02:33:54 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 14479 invoked by uid 500); 30 Jun 2008 02:33:54 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 14470 invoked by uid 99); 30 Jun 2008 02:33:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Jun 2008 19:33:54 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 02:33:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 502492388A02; Sun, 29 Jun 2008 19:33:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080630023302.502492388A02@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>