geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r609513 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java webapp/WEB-INF/view/realmwizard/list.jsp
Date Mon, 07 Jan 2008 04:56:28 GMT
Author: djencks
Date: Sun Jan  6 20:56:27 2008
New Revision: 609513

URL: http://svn.apache.org/viewvc?rev=609513&view=rev
Log:
GERONIMO-3734.  Remove all use of gbean state.  We know the gbean is started, it showed up
in a reference collection.  Thus showing the state provides no information.  GeronimoManagedBean
proxy was used only to get the state.

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=609513&r1=609512&r2=609513&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Sun Jan  6 20:56:27 2008
@@ -57,7 +57,6 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 import javax.security.auth.Subject;
-import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.spi.LoginModule;
 import javax.xml.namespace.QName;
 
@@ -84,7 +83,6 @@
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ListableRepository;
@@ -562,7 +560,6 @@
             configMgr = ConfigurationUtil.getConfigurationManager(kernel);
         }
         for (int i = 0; i < results.length; i++) {
-            final GeronimoManagedBean managedBean = (GeronimoManagedBean) realms[i];
             AbstractName abstractName = PortletManager.getNameFor(request, realms[i]);
             String parent;
             Configuration parentConfig = configMgr.getConfiguration(abstractName.getArtifact());
@@ -572,7 +569,7 @@
             } else {
                 parent = abstractName.getArtifact().toString();
             }
-            results[i] = new ExistingRealm(realms[i].getRealmName(), abstractName, managedBean.getState(),
parent);
+            results[i] = new ExistingRealm(realms[i].getRealmName(), abstractName, parent);
         }
         // Once done, release the ConfigurationManager
         if(configMgr != null) {
@@ -1071,14 +1068,11 @@
         private final String name;
         private final String abstractName;
         private final String parentName;
-        private final int state;
 
-        public ExistingRealm(String name, AbstractName abstractName, int state, String parent)
{
+        public ExistingRealm(String name, AbstractName abstractName, String parent) {
             this.name = name;
             this.abstractName = abstractName.toString();
             parentName = parent;
-            this.state = state;
-
         }
 
         public String getName() {
@@ -1093,13 +1087,6 @@
             return parentName;
         }
 
-        public int getState() {
-            return state;
-        }
-
-        public String getStateName() {
-            return State.toString(state);
-        }
     }
 
     public static class DatabasePool implements Serializable, Comparable {

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp?rev=609513&r1=609512&r2=609513&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
Sun Jan  6 20:56:27 2008
@@ -31,7 +31,6 @@
   <tr>
     <td class="DarkBackground"><fmt:message key="consolebase.common.name"/></td>
     <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.deployedAs"/></td>
-    <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.state"/></td>
     <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.actions"/></td>
   </tr>
 <c:forEach var="realm" items="${realms}">
@@ -47,7 +46,6 @@
         </c:otherwise>
       </c:choose>
     </td>
-    <td>${realm.stateName}</td>
     <td>
     <c:if test="${empty realm.parentName}">
          <%--<c:choose>



Mime
View raw message