geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r631758 - in /geronimo/server/trunk/plugins/console: console-portal-driver/src/main/webapp/WEB-INF/web.xml plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp plugin-portlets/src/main/webapp/WEB-INF/web.xml
Date Wed, 27 Feb 2008 22:30:00 GMT
Author: gawor
Date: Wed Feb 27 14:29:58 2008
New Revision: 631758

URL: http://svn.apache.org/viewvc?rev=631758&view=rev
Log:
forward all dwr requests through the /console context (GERONIMO-3781)

Modified:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=631758&r1=631757&r2=631758&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
Wed Feb 27 14:29:58 2008
@@ -98,6 +98,21 @@
     </init-param>
   </servlet>
 
+  <!-- DWR for the plugin portlets -->
+  <servlet>
+    <display-name>DWR Forward Servlet 4</display-name>
+    <servlet-name>dwr-forward4</servlet-name>
+    <servlet-class>org.apache.geronimo.console.servlet.ContextForwardServlet</servlet-class>
+    <init-param>
+       <param-name>servlet-path</param-name>
+       <param-value>/dwr4</param-value>
+    </init-param>
+    <init-param>
+       <param-name>context-path</param-name>
+       <param-value>/plugin</param-value>
+    </init-param>
+  </servlet>
+
   <servlet>
     <display-name>Generic Context Forward Servlet</display-name>
     <servlet-name>context-forward</servlet-name>
@@ -136,6 +151,11 @@
   </servlet-mapping>
 
   <servlet-mapping>
+    <servlet-name>dwr-forward4</servlet-name>
+    <url-pattern>/dwr4/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
     <servlet-name>plutoPortalDriver</servlet-name>
     <url-pattern>/portal/*</url-pattern>
   </servlet-mapping>
@@ -196,6 +216,7 @@
       <url-pattern>/dwr/*</url-pattern>
       <url-pattern>/dwr2/*</url-pattern>
       <url-pattern>/dwr3/*</url-pattern>
+      <url-pattern>/dwr4/*</url-pattern>
       <http-method>GET</http-method>
       <http-method>POST</http-method>
       <http-method>PUT</http-method>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp?rev=631758&r1=631757&r2=631758&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
Wed Feb 27 14:29:58 2008
@@ -20,9 +20,9 @@
 <fmt:setBundle basename="pluginportlets"/>
 <fmt:message key="car.downloadStatus.processing"/>
 <portlet:defineObjects/>
-<script type='text/javascript' src='/plugin/dwr/interface/ProgressMonitor.js'></script>
-<script type='text/javascript' src='/plugin/dwr/engine.js'></script>
-<script type='text/javascript' src='/plugin/dwr/util.js'></script>
+<script type='text/javascript' src='/console/dwr4/interface/ProgressMonitor.js'></script>
+<script type='text/javascript' src='/console/dwr4/engine.js'></script>
+<script type='text/javascript' src='/console/dwr4/util.js'></script>
 
 <div id="<portlet:namespace/>progressMeter" style="display: none; padding-top: 5px;">
     <div>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml?rev=631758&r1=631757&r2=631758&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
Wed Feb 27 14:29:58 2008
@@ -54,7 +54,7 @@
     </filter-mapping>
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
-        <url-pattern>/dwr/*</url-pattern>
+        <url-pattern>/dwr4/*</url-pattern>
     </servlet-mapping>
     
     <servlet>
@@ -132,7 +132,7 @@
             
             <!--<url-pattern>/</url-pattern>-->
             <url-pattern>/PlutoInvoker/*</url-pattern>
-            <url-pattern>/dwr/*</url-pattern>
+            <url-pattern>/dwr4/*</url-pattern>
             <url-pattern>/car-export</url-pattern>
             <url-pattern>/maven-repo/*</url-pattern>
             <url-pattern>/plan-export</url-pattern>



Mime
View raw message