You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/07/15 04:52:24 UTC

svn commit: r964285 - /geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java

Author: xuhaihong
Date: Thu Jul 15 02:52:24 2010
New Revision: 964285

URL: http://svn.apache.org/viewvc?rev=964285&view=rev
Log:
Update the distributable merge rule

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java?rev=964285&r1=964284&r2=964285&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/webfragment/DistributableMergeHandler.java Thu Jul 15 02:52:24 2010
@@ -28,19 +28,19 @@ import org.apache.openejb.jee.WebFragmen
  */
 public class DistributableMergeHandler implements WebFragmentMergeHandler<WebFragment, WebApp> {
 
-    public static final String CURRENT_MERGED_DISTRIBUTABLE_VALUE = "CURRENT_MERGED_DISTRIBUTABLE_VALUE";
+    public static final String APPLICATION_DISTRIBUTABLE_VALUE = "distributable";
 
     @Override
     public void merge(WebFragment webFragment, WebApp webApp, MergeContext mergeContext) throws DeploymentException {
-        boolean currentMergedDistributableValue = (Boolean) mergeContext.getAttribute(CURRENT_MERGED_DISTRIBUTABLE_VALUE);
+        boolean currentMergedDistributableValue = (Boolean) mergeContext.getAttribute(APPLICATION_DISTRIBUTABLE_VALUE);
         if (currentMergedDistributableValue) {
-            mergeContext.setAttribute(CURRENT_MERGED_DISTRIBUTABLE_VALUE, webFragment.getDistributable().size() > 0);
+            mergeContext.setAttribute(APPLICATION_DISTRIBUTABLE_VALUE, webFragment.getDistributable().size() > 0);
         }
     }
 
     @Override
     public void postProcessWebXmlElement(WebApp webApp, MergeContext mergeContext) throws DeploymentException {
-        boolean currentMergedDistributableValue = (Boolean) mergeContext.getAttribute(CURRENT_MERGED_DISTRIBUTABLE_VALUE);
+        boolean currentMergedDistributableValue = (Boolean) mergeContext.getAttribute(APPLICATION_DISTRIBUTABLE_VALUE);
         boolean distributableInWebXml = webApp.getDistributable().size() > 0;
         if (currentMergedDistributableValue) {
             if (!distributableInWebXml) {
@@ -57,6 +57,6 @@ public class DistributableMergeHandler i
 
     @Override
     public void preProcessWebXmlElement(WebApp webApp, MergeContext context) throws DeploymentException {
-        context.setAttribute(CURRENT_MERGED_DISTRIBUTABLE_VALUE, Boolean.TRUE);
+        context.setAttribute(CURRENT_MERGED_DISTRIBUTABLE_VALUE, webApp.getDistributable().size() > 0);
     }
 }