geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Bohn <joe.b...@earthlink.net>
Subject Re: svn commit: r515107 - in /geronimo/server/trunk: configs/j2ee-deployer/src/plan/ modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/...
Date Tue, 06 Mar 2007 21:17:59 GMT
Gianny,

This appears to be breaking deployment of applications for the TCK (NPEs 
... see below).  Once I locally reverted this change things started 
working again.  Please see details on the tck list with subject "All 
deployments failing on 2.0 tck").


Deployer operation failed: java.lang.NullPointerException
org.apache.geronimo.common.DeploymentException: 
java.lang.NullPointerException
         at 
org.apache.geronimo.deployment.Deployer.deploy(Deployer.java:383)
         at 
org.apache.geronimo.deployment.Deployer.deploy(Deployer.java:124)
         at 
org.apache.geronimo.deployment.Deployer$$FastClassByCGLIB$$734a235d.invoke(<generated>)
         at net.sf.cglib.reflect.FastMethod.invoke(FastMethod.java:53)
         at 
org.apache.geronimo.gbean.runtime.FastMethodInvoker.invoke(FastMethodInvoker.java:38)
         at 
org.apache.geronimo.gbean.runtime.GBeanOperation.invoke(GBeanOperation.java:127)
         at 
org.apache.geronimo.gbean.runtime.GBeanInstance.invoke(GBeanInstance.java:855)
....



Thanks,
Joe

gdamour@apache.org wrote:
> Author: gdamour
> Date: Tue Mar  6 04:48:28 2007
> New Revision: 515107
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=515107
> Log:
> Process persistence units located in the EAR library folder.
> 
> This fixes GERONIMO-2928 - PersistenceUnit located in the EAR library directory is not
yet implemented
> 
> Modified:
>     geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
>     geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
>     geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
>     geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
> 
> Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=515107&r1=515106&r2=515107
> ==============================================================================
> --- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Mar  6 04:48:28
2007
> @@ -39,6 +39,11 @@
>          <reference name="ServiceBuilders">
>              <name>GBeanBuilder</name>
>          </reference>
> +        <references name="PersistenceUnitBuilders">
> +            <pattern>
> +                <name>PersistenceUnitBuilder</name>
> +            </pattern>
> +        </references>
>          <references name="EJBConfigBuilder">
>              <pattern>
>                  <name>EJBBuilder</name>
> 
> Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?view=diff&rev=515107&r1=515106&r2=515107
> ==============================================================================
> --- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
> +++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Tue Mar  6 04:48:28 2007
> @@ -153,6 +153,7 @@
>                      null,
>                      null,
>                      serviceBuilder,
> +                    null,
>                      kernel.getNaming());
>              ConfigurationData configData = null;
>              DeploymentContext context = null;
> 
> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=515107&r1=515106&r2=515107
> ==============================================================================
> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Tue Mar  6 04:48:28 2007
> @@ -91,6 +91,7 @@
>  import org.apache.geronimo.xbeans.javaee.ApplicationDocument;
>  import org.apache.geronimo.xbeans.javaee.ApplicationType;
>  import org.apache.geronimo.xbeans.javaee.ModuleType;
> +import org.apache.xmlbeans.QNameSet;
>  import org.apache.xmlbeans.XmlCursor;
>  import org.apache.xmlbeans.XmlException;
>  import org.apache.xmlbeans.XmlObject;
> @@ -114,6 +115,7 @@
>      private final SingleElementCollection resourceReferenceBuilder;
>      private final NamespaceDrivenBuilderCollection securityBuilders;
>      private final NamespaceDrivenBuilderCollection serviceBuilders;
> +    private final NamespaceDrivenBuilderCollection persistenceUnitBuilders;
>  
>      private final Environment defaultEnvironment;
>      private final AbstractNameQuery serverName;
> @@ -139,6 +141,7 @@
>              Collection appClientConfigBuilder,
>              Collection securityBuilders,
>              Collection serviceBuilders,
> +            Collection<NamespaceDrivenBuilder> persistenceUnitBuilders,
>              Kernel kernel) {
>          this(defaultEnvironment,
>                  transactionManagerAbstractName,
> @@ -156,6 +159,7 @@
>                  new SingleElementCollection(appClientConfigBuilder),
>                  securityBuilders,
>                  serviceBuilders,
> +                persistenceUnitBuilders,
>                  kernel.getNaming());
>      }
>  
> @@ -174,6 +178,7 @@
>              ModuleBuilder appClientConfigBuilder,
>              NamespaceDrivenBuilder securityBuilder,
>              NamespaceDrivenBuilder serviceBuilder,
> +            NamespaceDrivenBuilder persistenceUnitBuilder,
>              Naming naming) {
>          this(defaultEnvironment,
>                  transactionManagerAbstractName,
> @@ -191,6 +196,7 @@
>                  new SingleElementCollection(appClientConfigBuilder),
>                  securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
>                  serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
> +                persistenceUnitBuilder == null ? Collections.EMPTY_SET : Collections.singleton(persistenceUnitBuilder),
>                  naming);
>      }
>  
> @@ -210,6 +216,7 @@
>              SingleElementCollection appClientConfigBuilder,
>              Collection securityBuilders,
>              Collection serviceBuilders,
> +            Collection<NamespaceDrivenBuilder> persistenceUnitBuilders,
>              Naming naming) {
>          this.configurationManager = configurationManager;
>          this.repositories = repositories;
> @@ -222,7 +229,8 @@
>          this.appClientConfigBuilder = appClientConfigBuilder;
>          this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders,
GerSecurityDocument.type.getDocumentElementName());
>          this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders,
GBeanBuilder.SERVICE_QNAME);
> -
> +        this.persistenceUnitBuilders = new NamespaceDrivenBuilderCollection(persistenceUnitBuilders,
QName.valueOf("Placeholder-Not-Used"));
> +        
>          this.transactionManagerObjectName = transactionManagerAbstractName;
>          this.connectionTrackerObjectName = connectionTrackerAbstractName;
>          this.transactionalTimerObjectName = transactionalTimerAbstractName;
> @@ -550,7 +558,10 @@
>                  securityBuilders.build(geronimoApplication, earContext, earContext);
>                  serviceBuilders.build(geronimoApplication, earContext, earContext);
>              }
> -
> +            
> +            // process persistence unit in EAR library directory
> +            persistenceUnitBuilders.build(geronimoApplication, earContext, earContext);
> +            
>              // Create the J2EEApplication managed object
>              if (ConfigurationModuleType.EAR == applicationType) {
>                  GBeanData gbeanData = new GBeanData(earContext.getModuleName(), J2EEApplicationImpl.GBEAN_INFO);
> @@ -1036,6 +1047,7 @@
>          infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
>          infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
>          infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
> +        infoBuilder.addReference("PersistenceUnitBuilders", NamespaceDrivenBuilder.class,
NameFactory.MODULE_BUILDER);
>  
>          infoBuilder.addAttribute("kernel", Kernel.class, false);
>  
> @@ -1055,6 +1067,7 @@
>                  "AppClientConfigBuilder",
>                  "SecurityBuilders",
>                  "ServiceBuilders",
> +                "PersistenceUnitBuilders",
>                  "kernel"
>          });
>  
> 
> Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?view=diff&rev=515107&r1=515106&r2=515107
> ==============================================================================
> --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
(original)
> +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
Tue Mar  6 04:48:28 2007
> @@ -16,7 +16,6 @@
>   */
>  package org.apache.geronimo.j2ee.deployment;
>  
> -import java.io.IOException;
>  import java.util.Collections;
>  import java.util.Map;
>  import java.util.jar.JarFile;
> @@ -76,6 +75,8 @@
>      
>      protected static final NamespaceDrivenBuilder serviceBuilder = null;
>  
> +    protected static final NamespaceDrivenBuilder persistenceUnitBuilder = null;
> +
>      protected static final Naming naming = new Jsr77Naming();
>  
>      protected static final AbstractName rootConfig = naming.createRootName(new Artifact("test",
"stuff", "", "car"), "test", "test") ;
> @@ -140,6 +141,7 @@
>                      appClientConfigBuilder,
>                      securityBuilder,
>                      serviceBuilder,
> +                    persistenceUnitBuilder,
>                      naming);
>  
>              Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
> @@ -171,6 +173,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> @@ -208,6 +211,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> @@ -245,6 +249,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> @@ -282,6 +287,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> @@ -319,6 +325,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>  
> @@ -357,6 +364,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> @@ -394,6 +402,7 @@
>                  appClientConfigBuilder,
>                  securityBuilder,
>                  serviceBuilder,
> +                persistenceUnitBuilder,
>                  naming);
>  
>          ConfigurationData configurationData = null;
> 
> 
> 

Mime
View raw message