geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r535381 [2/2] - in /geronimo/server/trunk: configs/client-deployer/src/plan/ modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/ mod...
Date Fri, 04 May 2007 21:04:20 GMT
Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java?view=diff&rev=535381&r1=535380&r2=535381
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
Fri May  4 14:04:18 2007
@@ -76,13 +76,10 @@
         return plan != null && plan.selectChildren(PersistenceUnitRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME_SET).length
> 0;
     }
 
-    public void initContext(XmlObject specDD, XmlObject plan, Configuration localConfiguration,
Configuration remoteConfiguration, Module module) throws DeploymentException {
-    }
-
-    public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration,
Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException
{
-
+    public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map componentContext)
throws DeploymentException {
+        Configuration localConfiguration = module.getEarContext().getConfiguration();
         // Discover and process any @PersistenceUnitRef annotations (if !metadata-complete)
-        if ((module != null) && (module.getClassFinder() != null)) {
+        if (module.getClassFinder() != null) {
             processAnnotations(module);
         }
 
@@ -126,7 +123,7 @@
                 }
                 checkForGBean(localConfiguration, persistenceUnitNameQuery, true);
 
-                PersistenceUnitReference reference = new PersistenceUnitReference(getConfigId(localConfiguration,
remoteConfiguration), persistenceUnitNameQuery);
+                PersistenceUnitReference reference = new PersistenceUnitReference(module.getConfigId(),
persistenceUnitNameQuery);
 
                 NamingBuilder.JNDI_KEY.get(componentContext).put(ENV + persistenceUnitRefName,
reference);
             } catch (DeploymentException e) {
@@ -144,7 +141,7 @@
 
                 checkForGBean(localConfiguration, persistenceUnitNameQuery, true);
 
-                PersistenceUnitReference reference = new PersistenceUnitReference(getConfigId(localConfiguration,
remoteConfiguration), persistenceUnitNameQuery);
+                PersistenceUnitReference reference = new PersistenceUnitReference(module.getConfigId(),
persistenceUnitNameQuery);
 
                 NamingBuilder.JNDI_KEY.get(componentContext).put(ENV + PersistenceUnitRefName,
reference);
             } catch (DeploymentException e) {

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?view=diff&rev=535381&r1=535380&r2=535381
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Fri May  4 14:04:18 2007
@@ -713,7 +713,7 @@
         }
         getNamingBuilders().buildEnvironment(webApp, module.getVendorDD(), module.getEnvironment());
         //this is silly
-        getNamingBuilders().initContext(webApp, gerWebApp, module.getEarContext().getConfiguration(),
earContext.getConfiguration(), module);
+        getNamingBuilders().initContext(webApp, gerWebApp, module);
 
         Map servletNameToPathMap = buildServletNameToPathMap((WebAppType) module.getSpecDD(),
((WebModule) module).getContextRoot());
 
@@ -806,7 +806,7 @@
         //This means that you cannot use the default environment of the web builder to add
configs that will be searched.
         Configuration earConfiguration = earContext.getConfiguration();
         Configuration localConfiguration = moduleContext.getConfiguration();
-        getNamingBuilders().buildNaming(webApp, vendorPlan, localConfiguration, earConfiguration,
webModule, buildingContext);
+        getNamingBuilders().buildNaming(webApp, vendorPlan, webModule, buildingContext);
 
         Map compContext = NamingBuilder.JNDI_KEY.get(buildingContext);
         Holder holder = NamingBuilder.INJECTION_KEY.get(buildingContext);



Mime
View raw message