You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/02/05 22:07:12 UTC
svn commit: r741292 - in /geronimo/server/branches/2.1:
plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
pom.xml
Author: gawor
Date: Thu Feb 5 21:07:12 2009
New Revision: 741292
URL: http://svn.apache.org/viewvc?rev=741292&view=rev
Log:
switch to openejb 3.0.1-SNAPSHOT and xbean version 3.4.1 (except xbean-naming)
Modified:
geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
geronimo/server/branches/2.1/pom.xml
Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?rev=741292&r1=741291&r2=741292&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java Thu Feb 5 21:07:12 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());
@@ -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/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=741292&r1=741291&r2=741292&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Feb 5 21:07:12 2009
@@ -70,7 +70,7 @@
<!--
Having a single well named version properties makes automatic updating for the weekly build much easier.
-->
- <openejbVersion>3.0</openejbVersion>
+ <openejbVersion>3.0.1-SNAPSHOT</openejbVersion>
<derbyVersion>10.4.2.0</derbyVersion>
<tomcatVersion>6.0.18</tomcatVersion>
<tranqlVendorsVersion>1.4</tranqlVendorsVersion>
@@ -82,7 +82,7 @@
<springVersion>2.5.6</springVersion>
<plutoVersion>1.1.6-G643117</plutoVersion>
<openjpaVersion>1.2.1-SNAPSHOT</openjpaVersion>
- <xbeanVersion>3.3</xbeanVersion>
+ <xbeanVersion>3.4.1</xbeanVersion>
<wadiVersion>2.0</wadiVersion>
<!-- Deployers -->