Return-Path: 
 <scm-return-25688-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 84577 invoked from network); 27 Feb 2008 22:30:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 27 Feb 2008 22:30:24 -0000
Received: (qmail 70261 invoked by uid 500); 27 Feb 2008 22:30:19 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 70253 invoked by uid 500); 27 Feb 2008 22:30:19 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 70244 invoked by uid 99); 27 Feb 2008 22:30:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2008 14:30:19 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2008 22:29:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9A8821A9832; Wed, 27 Feb 2008 14:30:00 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080227223000.9A8821A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>