You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/01/17 03:14:35 UTC
svn commit: r1059723 - in /geronimo/server/trunk/plugins/j2ee:
geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/
j2ee-deployer/src/main/plan/
Author: genspring
Date: Mon Jan 17 02:14:34 2011
New Revision: 1059723
URL: http://svn.apache.org/viewvc?rev=1059723&view=rev
Log:
need to install BV Gbean for EAR because PU in EAR/lib/*.jars are using it.
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1059723&r1=1059722&r2=1059723&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon Jan 17 02:14:34 2011
@@ -134,6 +134,7 @@ public class EARConfigBuilder implements
private final SingleElementCollection appClientConfigBuilder;
private final SingleElementCollection resourceReferenceBuilder;
private final NamespaceDrivenBuilderCollection serviceBuilders;
+ private final Collection<ModuleBuilderExtension> BValModuleBuilders;
private final Collection<ModuleBuilderExtension> persistenceUnitBuilders;
private final NamingBuilder namingBuilders;
@@ -174,6 +175,7 @@ public class EARConfigBuilder implements
@ParamReference(name = "ActivationSpecInfoLocator", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilder> resourceReferenceBuilder,
@ParamReference(name = "AppClientConfigBuilder", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilder> appClientConfigBuilder,
@ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<NamespaceDrivenBuilder> serviceBuilders,
+ @ParamReference(name = "BValModuleBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilderExtension> BValModuleBuilders,
@ParamReference(name = "PersistenceUnitBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilderExtension> persistenceUnitBuilders,
@ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER) NamingBuilder namingBuilders,
@ParamReference(name = "ArtifactResolvers", namingType = "ArtifactResolver") Collection<? extends ArtifactResolver> artifactResolvers,
@@ -193,6 +195,7 @@ public class EARConfigBuilder implements
new SingleElementCollection<ModuleBuilder>(resourceReferenceBuilder),
new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
serviceBuilders,
+ BValModuleBuilders,
persistenceUnitBuilders,
namingBuilders,
kernel.getNaming(),
@@ -213,6 +216,7 @@ public class EARConfigBuilder implements
ActivationSpecInfoLocator activationSpecInfoLocator,
ModuleBuilder appClientConfigBuilder,
NamespaceDrivenBuilder serviceBuilder,
+ ModuleBuilderExtension BValModuleBuilder,
ModuleBuilderExtension persistenceUnitBuilder,
NamingBuilder namingBuilders,
Naming naming,
@@ -231,6 +235,7 @@ public class EARConfigBuilder implements
new SingleElementCollection<ActivationSpecInfoLocator>(activationSpecInfoLocator),
new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet() : Collections.singleton(serviceBuilder),
+ BValModuleBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(BValModuleBuilder),
persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(persistenceUnitBuilder),
namingBuilders,
naming,
@@ -252,6 +257,7 @@ public class EARConfigBuilder implements
SingleElementCollection resourceReferenceBuilder,
SingleElementCollection appClientConfigBuilder,
Collection<NamespaceDrivenBuilder> serviceBuilders,
+ Collection<ModuleBuilderExtension> BValModuleBuilders,
Collection<ModuleBuilderExtension> persistenceUnitBuilders,
NamingBuilder namingBuilders,
Naming naming,
@@ -267,6 +273,7 @@ public class EARConfigBuilder implements
this.connectorConfigBuilder = connectorConfigBuilder;
this.appClientConfigBuilder = appClientConfigBuilder;
this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
+ this.BValModuleBuilders = BValModuleBuilders;
this.persistenceUnitBuilders = persistenceUnitBuilders;
this.namingBuilders = namingBuilders;
@@ -646,6 +653,11 @@ public class EARConfigBuilder implements
}
if (ConfigurationModuleType.EAR == applicationType) {
+
+ for (ModuleBuilderExtension mbe : BValModuleBuilders) {
+ mbe.initContext(earContext, applicationInfo, earContext.getDeploymentBundle());
+ }
+
// process persistence unit in EAR library directory
for (ModuleBuilderExtension mbe : persistenceUnitBuilders) {
mbe.initContext(earContext, applicationInfo, earContext.getDeploymentBundle());
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=1059723&r1=1059722&r2=1059723&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java Mon Jan 17 02:14:34 2011
@@ -82,6 +82,8 @@ public abstract class EARConfigBuilderTe
protected static final NamespaceDrivenBuilder securityBuilder = null;
protected static final NamespaceDrivenBuilder serviceBuilder = null;
+
+ protected static final ModuleBuilderExtension BValModuleBuilder = null;
protected static final ModuleBuilderExtension persistenceUnitBuilder = null;
@@ -167,6 +169,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -200,6 +203,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -239,6 +243,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -278,6 +283,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -317,6 +323,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -356,6 +363,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -396,6 +404,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
@@ -435,6 +444,7 @@ public abstract class EARConfigBuilderTe
activationSpecInfoLocator,
appClientConfigBuilder,
serviceBuilder,
+ BValModuleBuilder,
persistenceUnitBuilder,
namingBuilder,
naming,
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=1059723&r1=1059722&r2=1059723&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Mon Jan 17 02:14:34 2011
@@ -40,6 +40,11 @@
<name>SecurityBuilder</name>
</pattern>
</references>
+ <references name="BValModuleBuilders">
+ <pattern>
+ <name>BValModuleBuilderExtension</name>
+ </pattern>
+ </references>
<references name="PersistenceUnitBuilders">
<pattern>
<name>PersistenceUnitBuilder</name>