[openejb-scm] [2581] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment: Fix numerous bugs, building configs seems to work except for ears with wars inside.

Fri, 24 Mar 2006 01:12:35 -0800

Title: [2581] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment: Fix numerous bugs, building configs seems to work except for ears with wars inside.
Revision
2581
Author
djencks
Date
2006-03-24 04:15:07 -0500 (Fri, 24 Mar 2006)

Log Message

Fix numerous bugs, building configs seems to work except for ears with wars inside.


Modified Paths

Diff

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2580 => 2581)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-24 02:08:41 UTC (rev 2580)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java	2006-03-24 09:15:07 UTC (rev 2581)
@@ -73,7 +73,6 @@
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.schema.NamespaceElementConverter;
 import org.apache.geronimo.schema.SchemaConversionUtils;
@@ -123,6 +122,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Collection;
 import java.util.jar.JarFile;
 
 
@@ -294,7 +294,7 @@
         return openejbEjbJar;
     }
 
-    public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
+    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
         JarFile moduleFile = module.getModuleFile();
         try {
             // extract the ejbJar file into a standalone packed jar file and add the contents to the output
@@ -328,7 +328,14 @@
         entityBuilder.initContext(earContext, moduleBaseName, moduleUri, cl, enterpriseBeans);
         cmpEntityBuilder.initContext(earContext, moduleBaseName, moduleUri, cl, enterpriseBeans);
         mdbBuilder.initContext(cl, enterpriseBeans);
-
+        /**
+         * Build the security configuration.  Attempt to auto generate role mappings.
+         */
+        OpenejbOpenejbJarType openejbEjbJar = (OpenejbOpenejbJarType) module.getVendorDD();
+        if (openejbEjbJar.isSetSecurity()) {
+            SecurityConfiguration securityConfiguration = SecurityBuilder.buildSecurityConfiguration(openejbEjbJar.getSecurity(), cl);
+            earContext.setSecurityConfiguration(securityConfiguration);
+        }
     }
 
     public CMPEntityBuilder getCmpEntityBuilder() {
@@ -351,7 +358,7 @@
      * Does the meaty work of processing the deployment information and
      * creating GBeans for all the EJBs in the JAR, etc.
      */
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repositories) throws DeploymentException {
         AbstractName moduleBaseName = module.getModuleName();
 
         DataSourceDelegate delegate = new DataSourceDelegate();
@@ -483,15 +490,7 @@
             transactionPolicyHelper = new TransactionPolicyHelper();
         }
 
-        /**
-         * Build the security configuration.  Attempt to auto generate role mappings.
-         */
-        if (openejbEjbJar.isSetSecurity()) {
-            SecurityConfiguration securityConfiguration = SecurityBuilder.buildSecurityConfiguration(openejbEjbJar.getSecurity(), cl);
-            earContext.setSecurityConfiguration(securityConfiguration);
-        }
 
-
         ComponentPermissions componentPermissions = new ComponentPermissions(new Permissions(), new Permissions(), new HashMap());
         //TODO go back to the commented version when possible
 //          String contextID = ejbModuleObjectName.getCanonicalName();

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2580 => 2581)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-03-24 02:08:41 UTC (rev 2580)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-03-24 09:15:07 UTC (rev 2581)
@@ -53,6 +53,7 @@
 import java.sql.Connection;
 import java.sql.Statement;
 import java.util.jar.JarFile;
+import java.util.Collections;
 
 import javax.sql.DataSource;
 
@@ -157,7 +158,7 @@
             try {
                 jarFile = DeploymentUtil.createJarFile(moduleFile);
                 Object plan = earConfigBuilder.getDeploymentPlan(null, jarFile);
-                configurationData = earConfigBuilder.buildConfiguration(plan, jarFile, deploymentHelper.configStore);
+                configurationData = earConfigBuilder.buildConfiguration(plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
             } finally {
                 if (jarFile != null) {
                     jarFile.close();

Reply via email to