/**
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
package org.apache.geronimo.openejb;

import java.io.Serializable;

import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
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);
        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);
        dest.resourceEnvRefs.addAll(source.resourceEnvRefs);
        dest.persistenceContextRefs.addAll(source.persistenceContextRefs);
        dest.persistenceUnitRefs.addAll(source.persistenceUnitRefs);
        dest.serviceRefs.addAll(source.serviceRefs);
        dest.ejbLocalReferences.addAll(source.ejbLocalReferences);
        dest.ejbReferences.addAll(source.ejbReferences);
    }
}

@@ -1095,10 +1095,9 @@
 e %7B%0A
-%09
 %0A
+
     
@@ -1220,21 +1220,17 @@
 ndiEnc;%0A
-    
 %0A
+
     publ
@@ -1335,37 +1335,33 @@
 cInfo());%0A    %7D%0A
-    
 %0A
+
     public Geron
@@ -1565,37 +1565,33 @@
 pJndiEnc;%0A    %7D%0A
-    
 %0A
+
     public EjbJa
@@ -1643,29 +1643,25 @@
 Info;%0A    %7D%0A
-    
 %0A
+
     public A
@@ -1807,16 +1807,61 @@
 rInfo);%0A
+        appInfo.appId = ejbJarInfo.moduleId;%0A
         
@@ -1982,20 +1982,16 @@
 ;%0A    %7D%0A
-    
 %0A    pri

Update AppInfo initialize codes due to changes in OpenEJB