geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r581005 - in /geronimo/plugins/console/trunk: console-base-portlets/src/main/webapp/WEB-INF/ console-base-portlets/src/main/webapp/WEB-INF/view/car/ console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/ console-base-portlets/src...
Date Mon, 01 Oct 2007 16:15:19 GMT
Author: pmcmahan
Date: Mon Oct  1 09:15:18 2007
New Revision: 581005

URL: http://svn.apache.org/viewvc?rev=581005&view=rev
Log:
GERONIMO-3413 enable the servlet forwarding paths through the portal driver

Added:
    geronimo/plugins/console/trunk/console-portal-driver/src/main/java/org/apache/geronimo/console/gbean/
      - copied from r572776, geronimo/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/gbean/
    geronimo/plugins/console/trunk/console-portal-driver/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
      - copied unchanged from r580951, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
Removed:
    geronimo/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/gbean/
Modified:
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml
    geronimo/plugins/console/trunk/console-portal-driver/pom.xml
    geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
(original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
Mon Oct  1 09:15:18 2007
@@ -25,7 +25,7 @@
 <p>Use the button below to save the plugin "${name}" to disk.</p>
 
 <%-- todo: calculate the /console prefix somehow --%>
-<form action="/console/car-export" method="GET">
+<form action="/console/forwards/car-export" method="GET">
     <input type="hidden" name="configId" value="${configId}" />
     <input type="submit" value="Export Plugin" />
 </form>

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
(original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
Mon Oct  1 09:15:18 2007
@@ -61,7 +61,7 @@
 <p/>
 <div id="<portlet:namespace/>migratedPlan" style="display:inline">
 Migrated plan:
-<form method="POST" action="/console/plan-export">
+<form method="POST" action="/console/forwards/plan-export">
     <textarea name="migratedPlan" rows=10 cols=80><c:out escapeXml="true" value="${migratedPlan}"/></textarea>
     <br/>
     <button onclick="<portlet:namespace/>toggleDisplay('originalPlan');<portlet:namespace/>toggleDisplay('migratedPlan');return
false;">Show original plan</button>

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
(original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Mon Oct  1 09:15:18 2007
@@ -150,6 +150,6 @@
 <portlet:namespace/>callServer();
 </script>
 
-<embed src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/graphs/memoryGraphSVG.jsp")%>'
+<embed src='/console/forwards/graphs/memoryGraphSVG.jsp'
        width="600" height="450" type="image/svg+xml"
        pluginspage="http://www.adobe.com/svg/viewer/install/" />

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml Mon
Oct  1 09:15:18 2007
@@ -376,6 +376,8 @@
             <url-pattern>/car-export</url-pattern>
             <url-pattern>/maven-repo/*</url-pattern>
             <url-pattern>/plan-export</url-pattern>
+            <url-pattern>/graphs/*</url-pattern>
+            <url-pattern>/ajax/*</url-pattern>
             
             <http-method>GET</http-method>
             <http-method>POST</http-method>

Modified: geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/plugins/console/trunk/console-jetty/src/main/plan/plan.xml Mon Oct  1 09:15:18
2007
@@ -36,6 +36,21 @@
             </dep:environment>
             <context-root>/console</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/car-export</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/car-export</attribute>
+            </gbean>
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/graphs</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/graphs</attribute>
+            </gbean>
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+            </gbean>
         </web-app>
     </module>
 
@@ -58,25 +73,6 @@
 
             <context-root>/console-base</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-
-
-            <!---  TODO:  are these gbeans still needed ?
-                <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/car-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/car-export</attribute>
-                </gbean>
-                <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/graphs</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/graphs</attribute>
-                </gbean>
-                <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/plan-export</attribute>
-                </gbean>
-            -->
 
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">

Modified: geronimo/plugins/console/trunk/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-portal-driver/pom.xml?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-portal-driver/pom.xml (original)
+++ geronimo/plugins/console/trunk/console-portal-driver/pom.xml Mon Oct  1 09:15:18 2007
@@ -53,6 +53,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml Mon
Oct  1 09:15:18 2007
@@ -77,7 +77,29 @@
     </init-param>
     <init-param>
        <param-name>context-path</param-name>
-       <param-value>/DebugViews</param-value>
+       <param-value>/debug-views</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <display-name>Generic Context Forward Servlet</display-name>
+    <servlet-name>context-forward</servlet-name>
+    <servlet-class>org.apache.geronimo.console.servlet.GenericForwardServlet</servlet-class>
+    <init-param>
+      <param-name>charset</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>form-encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>container-encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
     </init-param>
   </servlet>
 
@@ -107,6 +129,11 @@
     <url-pattern>/Logout</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>context-forward</servlet-name>
+    <url-pattern>/forwards/*</url-pattern>
+  </servlet-mapping>
+
   <taglib>
     <taglib-uri>http://java.sun.com/portlet</taglib-uri>
     <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
@@ -143,6 +170,9 @@
       <web-resource-name>console</web-resource-name>
       <url-pattern>/portal</url-pattern>
       <url-pattern>/portal/*</url-pattern>
+      <url-pattern>/forwards/*</url-pattern>
+      <url-pattern>/dwr/*</url-pattern>
+      <url-pattern>/dwr2/*</url-pattern>
       <http-method>GET</http-method>
       <http-method>POST</http-method>
       <http-method>PUT</http-method>

Modified: geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml?rev=581005&r1=581004&r2=581005&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/plugins/console/trunk/console-tomcat/src/main/plan/plan.xml Mon Oct  1 09:15:18
2007
@@ -37,6 +37,21 @@
             <context-root>/console</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/car-export</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/car-export</attribute>
+            </gbean>
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/graphs</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/graphs</attribute>
+            </gbean>
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+            </gbean>
         </web-app>
     </module>
 
@@ -60,25 +75,6 @@
             <context-root>/console-base</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
-
-
-            <!---  TODO:  are these gbeans still needed ?
-                <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/car-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/car-export</attribute>
-                </gbean>
-                <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/graphs</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/graphs</attribute>
-                </gbean>
-                <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/plan-export</attribute>
-                </gbean>
-            -->
 
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">



Mime
View raw message