geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1228563 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core: GeronimoServerBehaviourDelegate.java SynchronizeProjectOnServerTask.java
Date Sat, 07 Jan 2012 03:33:27 GMT
Author: gawor
Date: Sat Jan  7 03:33:26 2012
New Revision: 1228563

URL: http://svn.apache.org/viewvc?rev=1228563&view=rev
Log:
update status of published modules only

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.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=1228563&r1=1228562&r2=1228563&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
Sat Jan  7 03:33:26 2012
@@ -1658,4 +1658,7 @@ public class GeronimoServerBehaviourDele
         return osgiModuleHandler;
     }
     
+    public boolean isPublished(IModule[] module) {
+        return super.hasBeenPublished(module);
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.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/SynchronizeProjectOnServerTask.java?rev=1228563&r1=1228562&r2=1228563&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.java
Sat Jan  7 03:33:26 2012
@@ -56,11 +56,16 @@ public class SynchronizeProjectOnServerT
 
             try {
                 for (IModule module : modules) {
+                    IModule[] rootModule = new IModule[] { module };
+                    if (!delegate.isPublished(rootModule)) {
+                        Trace.trace(Trace.INFO, "SynchronizeProjectOnServerTask: Ignoring
non-published module: " + module, Activator.traceCore);
+                        continue;
+                    }
                     int state = delegate.getModuleHandler(module).getModuleState(module);
                     if (state == -1) {
                         removedModules.add(module);
                     } else {
-                        delegate.setModulesState(new IModule[] { module }, state);
+                        delegate.setModulesState(rootModule, state);
                     }
                 }
 



Mime
View raw message