You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/09/03 08:06:36 UTC
svn commit: r992218 - in /geronimo/server/trunk:
framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/
plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/
plugins/console/console-base-portl...
Author: genspring
Date: Fri Sep 3 06:06:36 2010
New Revision: 992218
URL: http://svn.apache.org/viewvc?rev=992218&view=rev
Log:
GERONIMO-5571 Console support for EBA modules:list EBA modules,start EBA modules,stop EBA modules and uninstall EBA moules.
Modified:
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java?rev=992218&r1=992217&r2=992218&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java Fri Sep 3 06:06:36 2010
@@ -44,8 +44,10 @@ public class ConfigurationModuleType imp
public static final ConfigurationModuleType SERVICE = new ConfigurationModuleType("SERVICE", 5);
public static final ConfigurationModuleType SPR = new ConfigurationModuleType("SPR", 6);
+
+ public static final ConfigurationModuleType EBA = new ConfigurationModuleType("EBA", 7);
- private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, SPR};
+ private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, SPR,EBA};
private final String name;
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java?rev=992218&r1=992217&r2=992218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java Fri Sep 3 06:06:36 2010
@@ -113,7 +113,7 @@ public class ApplicationInstaller implem
null,
environment,
moduleName,
- ConfigurationModuleType.SERVICE,
+ ConfigurationModuleType.EBA,
naming,
configurationManager,
null,
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=992218&r1=992217&r2=992218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Fri Sep 3 06:06:36 2010
@@ -375,6 +375,30 @@ limitations under the License.
</init-param>
</portlet>
+ <portlet>
+ <description>Portlet for displaying EBA modules</description>
+ <portlet-name>EBAModules</portlet-name>
+ <display-name>EBA Modules Portlet</display-name>
+ <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>zh</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>portletinfo</resource-bundle>
+ <portlet-info>
+ <title>Installed EBA Applications</title>
+ <short-title>EBA Modules</short-title>
+ <keywords>EBA Application EBA Module</keywords>
+ </portlet-info>
+ <init-param>
+ <name>config-type</name>
+ <value>EBA</value>
+ </init-param>
+ </portlet>
<portlet>
<description>Portlet for displaying System modules</description>
<portlet-name>SystemModules</portlet-name>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=992218&r1=992217&r2=992218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Fri Sep 3 06:06:36 2010
@@ -180,6 +180,15 @@ limitations under the License.
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>EBAModules</servlet-name>
+ <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>EBAModules</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
<servlet>
<servlet-name>SystemModules</servlet-name>
<servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
@@ -330,6 +339,10 @@ limitations under the License.
<servlet-name>WARModules</servlet-name>
<url-pattern>/PlutoInvoker/WARModules</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EBAModules</servlet-name>
+ <url-pattern>/PlutoInvoker/EBAModules</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>SystemModules</servlet-name>
<url-pattern>/PlutoInvoker/SystemModules</url-pattern>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=992218&r1=992217&r2=992218&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Fri Sep 3 06:06:36 2010
@@ -207,6 +207,15 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
+ <gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">2-2-5/Applications/User Assets/Application EBAs</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[EBAModules]</attribute>
+ <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
<gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
<attribute name="pageTitle">4-1/Security/Users and Groups</attribute>
<attribute name="portletContext">/console-base</attribute>