geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r345568 - in /geronimo/trunk/applications: console-framework/src/webapp/ console-framework/src/webapp/WEB-INF/data/ console-standard/src/webapp/WEB-INF/
Date Fri, 18 Nov 2005 21:08:16 GMT
Author: hogstrom
Date: Fri Nov 18 13:08:11 2005
New Revision: 345568

URL: http://svn.apache.org/viewcvs?rev=345568&view=rev
Log:
GERONIMO-1195 Welcome Page to Admin Console

Modified:
    geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
    geronimo/trunk/applications/console-framework/src/webapp/index.jsp
    geronimo/trunk/applications/console-framework/src/webapp/logout.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml

Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
(original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
Fri Nov 18 13:08:11 2005
@@ -20,6 +20,21 @@
     <fragment name="navigation" class="org.apache.pluto.portalImpl.aggregation.navigation.TabNavigation">
     </fragment>
 
+    <fragment name="welcome" type="page">
+        <navigation>
+            <title>Welcome</title>
+            <description>ico_geronimo_16x16.gif Provides information about the Geronimo
Console</description>
+        </navigation>
+
+        <fragment name="row1" type="row">
+            <fragment name="col1" type="column">
+                <fragment name="p1" type="portlet">
+                    <property name="portlet" value="5.0"/>
+                </fragment>
+            </fragment>
+        </fragment>
+    </fragment>
+
     <fragment name="server" type="page">
         <navigation>
             <title>Server</title>

Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
(original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
Fri Nov 18 13:08:11 2005
@@ -18,6 +18,9 @@
 <portlet-entity-registry>
     <application id="5">
         <definition-id>console-standard</definition-id>
+        <portlet id="0">
+           <definition-id>console-standard.Welcome</definition-id>
+        </portlet>
         <portlet id="1">
             <definition-id>console-standard.Applications</definition-id>
         </portlet>

Modified: geronimo/trunk/applications/console-framework/src/webapp/index.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/index.jsp?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/index.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/index.jsp Fri Nov 18 13:08:11
2005
@@ -1,4 +1,4 @@
 <%@ page language="java" %>
 <%
-	response.sendRedirect("./portal/server/server_info");
+	response.sendRedirect("./portal/welcome");
 %>

Modified: geronimo/trunk/applications/console-framework/src/webapp/logout.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/logout.jsp?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/logout.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/logout.jsp Fri Nov 18 13:08:11
2005
@@ -1,5 +1,5 @@
 <%@ page language="java" %>
 <%
     request.getSession().invalidate();
-	response.sendRedirect("./portal/info");
+	response.sendRedirect("./portal/welcome");
 %>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml Fri Nov 18
13:08:11 2005
@@ -22,6 +22,30 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
                         http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
 
+     <portlet>
+        <description>Initial portlet with Geronimo informat.</description>
+        <portlet-name>Welcome</portlet-name>
+        <display-name>Welcome Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.welcome.WelcomePortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Welcome</title>
+            <short-title>Welcome</short-title>
+            <keywords>Welcome</keywords>
+        </portlet-info>
+    </portlet>
+
 <!-- Server Tab -->
 
     <portlet>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml?rev=345568&r1=345567&r2=345568&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml Fri Nov 18 13:08:11
2005
@@ -22,6 +22,20 @@
 
     <display-name>Geronimo Management Console Portlets</display-name>
 
+     <servlet>
+        <description>Automated generated Portlet Wrapper</description>
+        <display-name>Pluto Wrapper for Welcome Portlet</display-name>
+        <servlet-name>Welcome</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-class</param-name>
+            <param-value>org.apache.geronimo.console.welcome.WelcomePortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.Welcome</param-value>
+        </init-param>
+    </servlet>
     <servlet>
         <display-name>Pluto Wrapper for EJB Server Portlet</display-name>
         <servlet-name>EJBServer</servlet-name>
@@ -666,6 +680,10 @@
 
 
 
+    <servlet-mapping>
+        <servlet-name>Welcome</servlet-name>
+        <url-pattern>/Welcome/*</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>EJBServer</servlet-name>
         <url-pattern>/EJBServer/*</url-pattern>



Mime
View raw message