Author: taylor
Date: Sat Nov 3 19:43:51 2007
New Revision: 591728
URL: http://svn.apache.org/viewvc?rev=591728&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-804
patch from Mohan Kannapareddy, additionally updated layout-portlets
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/commons/src/webapp/WEB-INF/web.xml
portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/webapp/WEB-INF/web.xml
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/commons/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/commons/src/webapp/WEB-INF/web.xml?rev=591728&r1=591727&r2=591728&view=diff
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/commons/src/webapp/WEB-INF/web.xml
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/commons/src/webapp/WEB-INF/web.xml
Sat Nov 3 19:43:51 2007
@@ -28,20 +28,12 @@
</servlet>
<servlet-mapping>
- <servlet-name>
- JetspeedContainer
- </servlet-name>
- <url-pattern>
- /portal/*
- </url-pattern>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/portal/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>
- JetspeedContainer
- </servlet-name>
- <url-pattern>
- /container/*
- </url-pattern>
+ <servlet-name>JetspeedContainer</servlet-name>
+ <url-pattern>/container/*</url-pattern>
</servlet-mapping>
<!-- The Usual Welcome File List -->
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/webapp/WEB-INF/web.xml?rev=591728&r1=591727&r2=591728&view=diff
==============================================================================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/webapp/WEB-INF/web.xml
(original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/webapp/WEB-INF/web.xml
Sat Nov 3 19:43:51 2007
@@ -36,9 +36,7 @@
<servlet-name>
JetspeedContainer
</servlet-name>
- <url-pattern>
- /container/*
- </url-pattern>
+ <url-pattern>/container/*</url-pattern>
</servlet-mapping>
<!-- Portlet tag library TLD -->
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml?rev=591728&r1=591727&r2=591728&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml
(original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml Sat
Nov 3 19:43:51 2007
@@ -153,89 +153,67 @@
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /portal/*
- </url-pattern>
+ <url-pattern>/portal/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /portlet/*
- </url-pattern>
+ <url-pattern>/portlet/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /jetspeed/*
- </url-pattern>
+ <url-pattern>/jetspeed/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /fileserver/*
- </url-pattern>
+ <url-pattern>/fileserver/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /ajaxapi/*
- </url-pattern>
+ <url-pattern>/ajaxapi/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /ajax/*
- </url-pattern>
+ <url-pattern>/ajax/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /desktop/*
- </url-pattern>
+ <url-pattern>/desktop/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /action/*
- </url-pattern>
+ <url-pattern>/action/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /render/*
- </url-pattern>
+ <url-pattern>/render/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /configure/*
- </url-pattern>
+ <url-pattern>/configure/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>
jetspeed
</servlet-name>
- <url-pattern>
- /dtconfigure/*
- </url-pattern>
+ <url-pattern>/dtconfigure/*</url-pattern>
</servlet-mapping>
<!-- Map *.vm files to Velocity -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
