geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r497371 - in /geronimo/server/trunk/modules: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/ geronimo-openejb/src/main/java/org/ap...
Date Thu, 18 Jan 2007 09:28:54 GMT
Author: dblevins
Date: Thu Jan 18 01:28:53 2007
New Revision: 497371

URL: http://svn.apache.org/viewvc?view=rev&rev=497371
Log:
Fixed to build offline.  Added the jndi mapped name logic to the test case.  Added MDB container
to test case.

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilderTest.java
    geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=497371&r1=497370&r2=497371
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Thu Jan 18 01:28:53 2007
@@ -209,7 +209,7 @@
         return new EjbModule(standAlone, moduleName, environment, moduleFile, targetPath,
ejbJar, openejbJar, geronimoOpenejb, ejbJarXml, sharedContext);
     }
 
-    private static void mapReferences(EjbJar ejbJar) {
+    protected static void mapReferences(EjbJar ejbJar) {
         for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
             for (EjbRef ref : enterpriseBean.getEjbRef()) {
                 String refName = ref.getEjbRefName();

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilderTest.java?view=diff&rev=497371&r1=497370&r2=497371
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilderTest.java
Thu Jan 18 01:28:53 2007
@@ -49,6 +49,7 @@
         addEjbContainer(openEjbSystem, "Default Stateful Container");
         addEjbContainer(openEjbSystem, "Default BMP Container");
         addEjbContainer(openEjbSystem, "Default CMP Container");
+        addEjbContainer(openEjbSystem, "Default MDB Container");
 
         // load ejb-jar.xml
         String ejbJarXml = XmlUtil.loadEjbJarXml(null, moduleFile);
@@ -62,10 +63,9 @@
         // create the module object
         ClassLoader classLoader = new URLClassLoader(new URL[] {file.toURL()}, getClass().getClassLoader());
         EjbModule ejbModule = new EjbModule(classLoader, moduleFile.getName(), ejbJar, openejbJar);
-
+        EjbModuleBuilder.mapReferences(ejbModule.getEjbJar());
         // configure the application
 //        EjbJarInfo ejbJarInfo = openEjbSystem.configureApplication(ejbModule);
-
 //        openEjbSystem.createEjbJar(ejbJarInfo, classLoader);
     }
 

Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?view=diff&rev=497371&r1=497370&r2=497371
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Thu Jan 18 01:28:53 2007
@@ -26,6 +26,7 @@
 import org.apache.openejb.Container;
 import org.apache.openejb.DeploymentInfo;
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.alt.config.ClientModule;
 import org.apache.openejb.alt.config.ConfigurationFactory;
 import org.apache.openejb.alt.config.EjbModule;
@@ -45,11 +46,13 @@
     private final Assembler assembler;
 
     public OpenEjbSystemGBean(TransactionManager transactionManager) throws Exception {
+        System.setProperty("duct tape","");
         if (transactionManager == null) {
             throw new NullPointerException("transactionManager is null");
         }
 
-        configurationFactory = new ConfigurationFactory();
+        boolean offline = true;
+        configurationFactory = new ConfigurationFactory(offline);
         assembler = new Assembler();
 
         TransactionServiceInfo transactionServiceInfo = new TransactionServiceInfo();



Mime
View raw message