geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1090162 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Date Fri, 08 Apr 2011 08:53:09 GMT
Author: hanhongfang
Date: Fri Apr  8 08:53:08 2011
New Revision: 1090162

URL: http://svn.apache.org/viewvc?rev=1090162&view=rev
Log:
GERONIMODEVTOOLS-727 Change OSGi bundle symbolic name leads the eba being deleted on server
in next publish but the eba project is still in server view

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java?rev=1090162&r1=1090161&r2=1090162&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Fri Apr  8 08:53:08 2011
@@ -455,7 +455,14 @@ abstract public class GeronimoServerBeha
                 modules.add(module);
             }
             if (delta == NO_CHANGE) {
-                delta = moduleDelta;
+                // If one of the module in EBA module has its symbolic name updated, but
the MENIFEST.MF doesn't get updated
+                // accordingly, we will get the DeltaList as NO_CHANGE for EBA module, and
REMOVED for the updated module. In 
+                // this situation, we should has the whole EBA redeployed instead of removed
+                if (GeronimoUtils.isEBAModule(rootModule) && moduleDelta == REMOVED)
{
+                    delta = CHANGED;
+                } else {
+                    delta = moduleDelta;
+                }                
             }
         }
         



Mime
View raw message