svn commit: r799054 - /geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java

[mc...@apache.org]

Author: mcconne
Date: Wed Jul 29 20:18:55 2009
New Revision: 799054

URL: http://svn.apache.org/viewvc?rev=799054&view=rev
Log:
GERONIMODEVTOOLS-575 Refine error message at the module level after deployment exception(s)

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

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=799054&r1=799053&r2=799054&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Wed Jul 29 20:18:55 2009
@@ -305,6 +305,7 @@
 
         _monitor = monitor;
 
+        setModuleStatus(module, null);
         setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
         try {
             //NO_CHANGE need if app is associated but not started and no delta
@@ -317,12 +318,11 @@
         }
         catch (CoreException e) {
             //
-            // Set the module publish state to UNKNOWN so that WTP will not display "Synchronized"
-            // for the module and server. What we should see in the Eclipse Server View in this case
-            // is nothing for the module, but "Republish" for the server. This is a very subtle
-            // distinction but the only indication to the GEP end-user that their module was not 
-            // successfully deployed.
+            // Set the module publish state to UNKNOWN so that WTP will display "Republish" instead
+            // "Synchronized" for the server state, and set the module status to an error message 
+            // for the GEP end-user to see. 
             //
+            setModuleStatus(module, new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error publishing module to server"));
             setModulePublishState(module, IServer.PUBLISH_STATE_UNKNOWN);
             throw e;
         }