geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r751966 - in /geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java webapp/WEB-INF/view/configmanager/normal.jsp
Date Tue, 10 Mar 2009 02:30:36 GMT
Author: xuhaihong
Date: Tue Mar 10 02:30:35 2009
New Revision: 751966

URL: http://svn.apache.org/viewvc?rev=751966&view=rev
Log:
GERONIMO-4555 Can't start App Client after stop it from console

Modified:
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=751966&r1=751965&r2=751966&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Tue Mar 10 02:30:35 2009
@@ -297,6 +297,9 @@
                                 }
                             }                                            
                         }
+                    } else if (info.getType().equals(ConfigurationModuleType.CAR)) {
+                        Configuration config = configManager.getConfiguration(info.getConfigID());
+                        details.setClientAppServerSide(config.getOwnedConfigurations().size()
> 0);
                     }
                     if (showDependencies) {
                         addDependencies(details, configObjName);
@@ -455,6 +458,8 @@
         private boolean expertConfig = false;   // used to mark this config as one that should
only be managed (stop/uninstall) by expert users.
         private List<String> contextPaths = new ArrayList<String>();
         private String componentName;
+        //This flag is used to indicate whether it is the client side if the module is a
client application
+        private boolean clientAppServerSide = false;
 
         public ModuleDetails(Artifact configId, ConfigurationModuleType type, State state)
{
             this.configId = configId;
@@ -508,5 +513,13 @@
         public void setComponentName(String name){
             componentName = name;
         }
+        
+        public void setClientAppServerSide(boolean clientAppServerSide) {
+            this.clientAppServerSide = clientAppServerSide;
+        }
+
+        public boolean isClientAppServerSide() {
+            return this.clientAppServerSide;
+        }
     }
 }

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=751966&r1=751965&r2=751966&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
Tue Mar 10 02:30:35 2009
@@ -281,7 +281,7 @@
                     &nbsp;<a><fmt:message key="consolebase.common.stop"/></a>&nbsp;
                 </span>
             </c:if>
-            <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name
ne 'CAR')}">
+            <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name
ne 'CAR' || moduleDetails.clientAppServerSide)}">
                 &nbsp;<a href="<portlet:actionURL><portlet:param name='configId'
value='${moduleDetails.configId}'/><portlet:param name='action' value='start'/></portlet:actionURL>"><fmt:message
key="consolebase.common.start"/></a>&nbsp;
             </c:if>
         </td>



Mime
View raw message