geronimo-scm mailing list archives

Author: xuhaihong
Date: Mon Aug 23 08:51:04 2010
New Revision: 988033

URL: http://svn.apache.org/viewvc?rev=988033&view=rev
Log:
Update AppInfo initialize codes due to changes in OpenEJB

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java?rev=988033&r1=988032&r2=988033&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
Mon Aug 23 08:51:04 2010
@@ -23,34 +23,35 @@ import org.apache.openejb.assembler.clas
 import org.apache.openejb.assembler.classic.JndiEncInfo;
 
 public class GeronimoEjbInfo implements Serializable {
-	
+
     private final EjbJarInfo ejbJarInfo;
     private final JndiEncInfo globalJndiEnc;
     private final JndiEncInfo appJndiEnc;
-    
+
     public GeronimoEjbInfo(EjbJarInfo ejbJarInfo) {
         this(ejbJarInfo, new JndiEncInfo(), new JndiEncInfo());
     }
-    
+
     public GeronimoEjbInfo(EjbJarInfo ejbJarInfo, JndiEncInfo globalJndiEnc, JndiEncInfo
appJndiEnc) {
         this.ejbJarInfo = ejbJarInfo;
         this.globalJndiEnc = globalJndiEnc;
         this.appJndiEnc = appJndiEnc;
     }
-    
+
     public EjbJarInfo getEjbJarInfo() {
         return ejbJarInfo;
     }
-    
+
     public AppInfo createAppInfo() {
         AppInfo appInfo = new AppInfo();
         appInfo.path = ejbJarInfo.path;
         appInfo.ejbJars.add(ejbJarInfo);
+        appInfo.appId = ejbJarInfo.moduleId;
         merge(appInfo.appJndiEnc, appJndiEnc);
         merge(appInfo.globalJndiEnc, globalJndiEnc);
         return appInfo;
     }
-    
+
     private static void merge(JndiEncInfo dest, JndiEncInfo source) {
         dest.envEntries.addAll(source.envEntries);
         dest.resourceRefs.addAll(source.resourceRefs);