geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r995184 - in /geronimo/server/trunk/plugins/bval: bval-deployer/src/main/plan/plan.xml geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
Date Wed, 08 Sep 2010 18:34:29 GMT
Author: rickmcguire
Date: Wed Sep  8 18:34:29 2010
New Revision: 995184

URL: http://svn.apache.org/viewvc?rev=995184&view=rev
Log:
fix a couple of problems with the bval default environment

Modified:
    geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java

Modified: geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml?rev=995184&r1=995183&r2=995184&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml Wed Sep  8 18:34:29
2010
@@ -24,7 +24,7 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
-                        <groupId>${pom.groupId}</groupId>
+                        <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-bval</artifactId>
                         <type>jar</type>
                     </dependency>

Modified: geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java?rev=995184&r1=995183&r2=995184&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
(original)
+++ geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
Wed Sep  8 18:34:29 2010
@@ -55,6 +55,12 @@ public class BValNamingBuilder extends A
         super(defaultEnvironment);
     }
 
+    @Override 
+    protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) {
+        // we always merge our information 
+        return true; 
+    }
+
     @Override
     public void buildNaming(JndiConsumer specDD, XmlObject xmlObject1, Module module, Map<EARContext.Key,
Object> sharedContext) throws DeploymentException {
         try {



Mime
View raw message