geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject svn commit: r740608 - in /geronimo/server/branches/2.0: ./ modules/geronimo-client/src/main/java/org/apache/geronimo/client/ modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ modules/geronimo-openejb/src/main/java/o...
Date Wed, 04 Feb 2009 05:15:58 GMT
Author: jaydm
Date: Wed Feb  4 05:15:57 2009
New Revision: 740608

URL: http://svn.apache.org/viewvc?rev=740608&view=rev
Log:
Geronimo-4527 - Changes necessary to fix the build after moving to OpenEJB 3.0.1-SNAPSHOT

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-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
    geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
    geronimo/server/branches/2.0/pom.xml

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=740608&r1=740607&r2=740608&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
Wed Feb  4 05:15:57 2009
@@ -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.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=740608&r1=740607&r2=740608&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
Wed Feb  4 05:15:57 2009
@@ -53,7 +53,9 @@
 import org.apache.openejb.assembler.classic.EjbJarInfo;
 import org.apache.openejb.assembler.classic.JndiEncBuilder;
 import org.apache.openejb.assembler.classic.JndiEncInfo;
+import org.apache.openejb.assembler.classic.AppInfo;
 import org.apache.openejb.config.JndiEncInfoBuilder;
+import org.apache.openejb.config.AppModule;
 import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
 import org.apache.openejb.jee.EjbLocalRef;
 import org.apache.openejb.jee.EjbRef;
@@ -140,14 +142,19 @@
             if (earData != null) {
                 ejbJars = earData.getEjbJars();
             }
-            JndiEncInfoBuilder jndiEncInfoBuilder = new JndiEncInfoBuilder(ejbJars);
+
+            AppInfo appInfo = new AppInfo();
+            appInfo.ejbJars.addAll(ejbJars);
+
+            JndiEncInfoBuilder jndiEncInfoBuilder = new JndiEncInfoBuilder(appInfo);
             JndiEncInfo jndiEncInfo;
             if (module.isStandAlone()) {
                 jndiEncInfo = jndiEncInfoBuilder.build(consumer, "GeronimoEnc", null);
             } else {
                 jndiEncInfo = jndiEncInfoBuilder.build(consumer, "GeronimoEnc", module.getTargetPath());
             }
-            JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, module.getName());
+            JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, null, module.getName(),
getClass().getClassLoader());
+
             map = jndiEncBuilder.buildMap();
         } catch (OpenEJBException e) {
             throw new DeploymentException(e);

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=740608&r1=740607&r2=740608&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Wed Feb  4 05:15:57 2009
@@ -59,12 +59,10 @@
 import org.apache.openejb.assembler.classic.ClientInfo;
 import org.apache.openejb.assembler.classic.ContainerInfo;
 import org.apache.openejb.assembler.classic.EjbJarInfo;
-import org.apache.openejb.assembler.classic.LinkResolver;
 import org.apache.openejb.assembler.classic.MdbContainerInfo;
 import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
 import org.apache.openejb.assembler.classic.SecurityServiceInfo;
 import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.assembler.classic.UniqueDefaultLinkResolver;
 import org.apache.openejb.assembler.dynamic.PassthroughFactory;
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.ClientModule;
@@ -360,17 +358,8 @@
 
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(classLoader);
-        LinkResolver<EntityManagerFactory> emfLinkResolver = new UniqueDefaultLinkResolver<EntityManagerFactory>();
-        for (PersistenceUnitGBean persistenceUnitGBean: persistenceUnitGBeans) {
-            EntityManagerFactory factory = persistenceUnitGBean.getEntityManagerFactory();
-            String persistenceUnitRoot = persistenceUnitGBean.getPersistenceUnitRoot();
-            String persistenceUnitName = persistenceUnitGBean.getPersistenceUnitName();
-            if (!"cmp".equals(persistenceUnitName)) {
-                emfLinkResolver.add(persistenceUnitRoot, persistenceUnitName, factory);
-            }
-        }
         try {
-            assembler.createEjbJar(ejbJarInfo, emfLinkResolver, classLoader);
+            assembler.createEjbJar(ejbJarInfo, classLoader);
         } finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
         }

Modified: geronimo/server/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/pom.xml?rev=740608&r1=740607&r2=740608&view=diff
==============================================================================
--- geronimo/server/branches/2.0/pom.xml (original)
+++ geronimo/server/branches/2.0/pom.xml Wed Feb  4 05:15:57 2009
@@ -61,7 +61,8 @@
         <!--
         Having a single well named property makes automatic updating for the weekly build
much easier.
         -->
-        <openejbVersion>3.0-beta-1</openejbVersion>
+        <openejbVersion>3.0.1-SNAPSHOT</openejbVersion>
+        <xbeanVersion>3.4.1</xbeanVersion>
 
         <!--
         HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
@@ -282,19 +283,19 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-finder</artifactId>
-                <version>3.2</version>
+                <version>${xbeanVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
-                <version>3.2</version>
+                <version>${xbeanVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-reflect</artifactId>
-                <version>3.2</version>
+                <version>${xbeanVersion}</version>
             </dependency>
 
             <dependency>



Mime
View raw message