You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/09/28 14:38:27 UTC

svn commit: r819511 [3/3] - in /portals/jetspeed-2/applications/j2-admin/trunk: ./ src/main/java/org/apache/jetspeed/portlets/sso/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/conf/

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml?rev=819511&r1=819510&r2=819511&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml Mon Sep 28 12:38:26 2009
@@ -1,50 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    <display-name>Jetspeed-2 Portal Administration Portlets</display-name>
-    <description>Administration Portlets for the Jetspeed-2 Enterprise Portal</description>
- 
-    <!-- for deploying on Websphere: disable Websphere default portletcontainer -->
-    <context-param>
-        <param-name>com.ibm.websphere.portletcontainer.PortletDeploymentEnabled</param-name>
-        <param-value>false</param-value>
-    </context-param>
-   
-    <!-- Wicket configuration to run in deployment mode -->
-    <context-param>
-      <param-name>configuration</param-name>
-      <param-value>deployment</param-value>
-    </context-param>
-    
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/springmvc/context/applicationContext.xml</param-value>
-	</context-param>
-    
-    <filter>
-      <filter-name>JetspeedPrincipalManagementPortlet</filter-name>
-      <filter-class>org.apache.jetspeed.portlets.wicket.JetspeedContextAwareWicketFilter</filter-class>
-      <init-param>
-        <param-name>applicationClassName</param-name>
-        <param-value>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementApplication</param-value>
-      </init-param>
-    </filter>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  version="2.4"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+  <display-name>Jetspeed-2 Portal Administration Portlets</display-name>
+  <description>Administration Portlets for the Jetspeed-2 Enterprise Portal</description>
+
+  <!--
+    for deploying on Websphere: disable Websphere default
+    portletcontainer
+  -->
+  <context-param>
+    <param-name>com.ibm.websphere.portletcontainer.PortletDeploymentEnabled</param-name>
+    <param-value>false</param-value>
+  </context-param>
+
+  <!-- Wicket configuration to run in deployment mode -->
+  <context-param>
+    <param-name>configuration</param-name>
+    <param-value>deployment</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>/WEB-INF/springmvc/context/applicationContext.xml</param-value>
+  </context-param>
+
+  <filter>
+    <filter-name>JetspeedPrincipalManagementPortlet</filter-name>
+    <filter-class>org.apache.jetspeed.portlets.wicket.JetspeedContextAwareWicketFilter</filter-class>
+    <init-param>
+      <param-name>applicationClassName</param-name>
+      <param-value>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementApplication</param-value>
+    </init-param>
+  </filter>
 
   <filter>
     <filter-name>WicketProfilerAdminApplication</filter-name>
@@ -65,13 +68,13 @@
   </filter>
 
   <filter>
-      <filter-name>PortalSiteManagerApplication</filter-name>
-      <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-      <init-param>
-        <param-name>applicationClassName</param-name>
-        <param-value>org.apache.jetspeed.portlets.site.PortalSiteManagerApplication</param-value>
-      </init-param>
-    </filter>
+    <filter-name>PortalSiteManagerApplication</filter-name>
+    <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+    <init-param>
+      <param-name>applicationClassName</param-name>
+      <param-value>org.apache.jetspeed.portlets.site.PortalSiteManagerApplication</param-value>
+    </init-param>
+  </filter>
 
   <filter>
     <filter-name>PortalDataSerializerApplication</filter-name>
@@ -81,7 +84,7 @@
       <param-value>org.apache.jetspeed.portlets.serializer.PortalDataSerializerApplication</param-value>
     </init-param>
   </filter>
-  
+
   <filter>
     <filter-name>PortletRegistryManager</filter-name>
     <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
@@ -90,7 +93,7 @@
       <param-value>org.apache.jetspeed.portlets.prm.ApplicationsListApplication</param-value>
     </init-param>
   </filter>
-  
+
   <filter>
     <filter-name>PortletDetailsManager</filter-name>
     <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
@@ -99,7 +102,7 @@
       <param-value>org.apache.jetspeed.portlets.prm.portlet.PortletDetailsApplication</param-value>
     </init-param>
   </filter>
-  
+
   <filter>
     <filter-name>PortletApplicationDetailsManager</filter-name>
     <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
@@ -108,7 +111,7 @@
       <param-value>org.apache.jetspeed.portlets.prm.application.ApplicationDetailsApplication</param-value>
     </init-param>
   </filter>
-    
+
   <filter>
     <filter-name>RPADPortlet</filter-name>
     <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
@@ -117,14 +120,14 @@
       <param-value>org.apache.jetspeed.portlets.rpad.RPADApplication</param-value>
     </init-param>
   </filter>
-    
-    <filter-mapping>
-      <filter-name>PortalSiteManagerApplication</filter-name>
-      <url-pattern>/portalSiteManager/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-  
+
+  <filter-mapping>
+    <filter-name>PortalSiteManagerApplication</filter-name>
+    <url-pattern>/portalSiteManager/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+
   <filter-mapping>
     <filter-name>PortalDataSerializerApplication</filter-name>
     <url-pattern>/portalDataSerializer/*</url-pattern>
@@ -132,13 +135,13 @@
     <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
 
-    <filter-mapping>
-      <filter-name>JetspeedPrincipalManagementPortlet</filter-name>
-      <url-pattern>/jetspeedPrincipalManagement/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-	
+  <filter-mapping>
+    <filter-name>JetspeedPrincipalManagementPortlet</filter-name>
+    <url-pattern>/jetspeedPrincipalManagement/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+
   <filter-mapping>
     <filter-name>WicketProfilerAdminApplication</filter-name>
     <url-pattern>/profileradmin/*</url-pattern>
@@ -159,109 +162,134 @@
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
-  
+
   <filter-mapping>
     <filter-name>PortletApplicationDetailsManager</filter-name>
     <url-pattern>/pad/*</url-pattern>
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
-  
+
   <filter-mapping>
     <filter-name>PortletDetailsManager</filter-name>
     <url-pattern>/pdm/*</url-pattern>
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
-      
-    <filter-mapping>
-      <filter-name>RPADPortlet</filter-name>
-      <url-pattern>/rpad/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-      
-  	<!-- Listener, that does all the startup work (configuration, init). -->
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-  
-	  <listener>
-	    <listener-class>org.apache.jetspeed.security.mfa.impl.MFAServletListener</listener-class>
-	  </listener>
-  
-    <!-- Define Velocity Servlet -->
-	<servlet>
-		<servlet-name>velocity</servlet-name>
-		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
-		<init-param>
-			<param-name>org.apache.velocity.toolbox</param-name>
-			<param-value>/WEB-INF/velocity/toolbox.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>org.apache.velocity.properties</param-name>
-			<param-value>/WEB-INF/velocity/velocity.properties</param-value>
-		</init-param>
-		<load-on-startup>10</load-on-startup>
-	</servlet>
-
-    <!-- Define Spring MVC View Servlet -->
-	<servlet>
-		<servlet-name>ViewRendererServlet</servlet-name>
-		<servlet-class>org.springframework.web.servlet.ViewRendererServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-  
-   <servlet>
+
+  <filter-mapping>
+    <filter-name>RPADPortlet</filter-name>
+    <url-pattern>/rpad/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+
+  <!-- Listener, that does all the startup work (configuration, init). -->
+
+  <listener>
+    <listener-class>
+      org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+
+  <listener>
+    <listener-class>org.apache.jetspeed.security.mfa.impl.MFAServletListener</listener-class>
+  </listener>
+
+  <!-- Default Reverse Proxy Servlet -->
+  <servlet>
+    <servlet-name>ReverseProxyServlet</servlet-name>
+    <servlet-class>
+      org.apache.portals.applications.webcontent.proxy.impl.DefaultHttpReverseProxyServlet</servlet-class>
+    <init-param>
+      <param-name>reverseproxy.configuration</param-name>
+      <param-value>/WEB-INF/conf/reverseproxy.properties</param-value>
+    </init-param>
+    <init-param>
+      <param-name>reverseproxy.configuration.refresh.delay</param-name>
+      <param-value>60000</param-value>
+    </init-param>
+    <load-on-startup>11</load-on-startup>
+  </servlet>
+
+  <!-- Define Velocity Servlet -->
+  <servlet>
+    <servlet-name>velocity</servlet-name>
+    <servlet-class>
+      org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+    <init-param>
+      <param-name>org.apache.velocity.toolbox</param-name>
+      <param-value>/WEB-INF/velocity/toolbox.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>org.apache.velocity.properties</param-name>
+      <param-value>/WEB-INF/velocity/velocity.properties</param-value>
+    </init-param>
+    <load-on-startup>10</load-on-startup>
+  </servlet>
+
+  <!-- Define Spring MVC View Servlet -->
+  <servlet>
+    <servlet-name>ViewRendererServlet</servlet-name>
+    <servlet-class>org.springframework.web.servlet.ViewRendererServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
     <description>MVC Servlet for Jetspeed Portlet Applications</description>
     <display-name>Jetspeed Container</display-name>
     <servlet-name>JetspeedContainer</servlet-name>
-    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+    <servlet-class>
+      org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
     <init-param>
       <param-name>contextName</param-name>
       <param-value>j2-admin</param-value>
     </init-param>
     <load-on-startup>100</load-on-startup>
-   </servlet>
-  
+  </servlet>
+
   <servlet-mapping>
     <servlet-name>JetspeedContainer</servlet-name>
     <url-pattern>/container/*</url-pattern>
   </servlet-mapping>
-      
-  	<!-- Map *.vm files to Velocity  -->
-	<servlet-mapping>
-		<servlet-name>velocity</servlet-name>
-		<url-pattern>*.vm</url-pattern>
-	</servlet-mapping>	
-
-    <!-- Map Spring MVC Servlet -->
-	<servlet-mapping>
-		<servlet-name>ViewRendererServlet</servlet-name>
-		<url-pattern>/WEB-INF/servlet/view</url-pattern>
-	</servlet-mapping>
-
-    <jsp-config>
-    
-      <!-- Tag libraries -->
-      <taglib>
-        <taglib-uri>c.tld</taglib-uri>
-        <taglib-location>/WEB-INF/c.tld</taglib-location>
-      </taglib>
-      <taglib>
-        <taglib-uri>fmt.tld</taglib-uri>
-        <taglib-location>/WEB-INF/fmt.tld</taglib-location>
-      </taglib>
-      <taglib>
-        <taglib-uri>sql.tld</taglib-uri>
-        <taglib-location>/WEB-INF/sql.tld</taglib-location>
-      </taglib>
-      <taglib>
-        <taglib-uri>x.tld</taglib-uri>
-        <taglib-location>/WEB-INF/x.tld</taglib-location>
-       </taglib>
-       
-    </jsp-config>
-  
+
+  <!-- Map /rproxy path to the Default Reverse Proxy Servlet -->
+  <servlet-mapping>
+    <servlet-name>ReverseProxyServlet</servlet-name>
+    <url-pattern>/rproxy/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- Map *.vm files to Velocity  -->
+  <servlet-mapping>
+    <servlet-name>velocity</servlet-name>
+    <url-pattern>*.vm</url-pattern>
+  </servlet-mapping>
+
+  <!-- Map Spring MVC Servlet -->
+  <servlet-mapping>
+    <servlet-name>ViewRendererServlet</servlet-name>
+    <url-pattern>/WEB-INF/servlet/view</url-pattern>
+  </servlet-mapping>
+
+  <jsp-config>
+
+    <!-- Tag libraries -->
+    <taglib>
+      <taglib-uri>c.tld</taglib-uri>
+      <taglib-location>/WEB-INF/c.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>fmt.tld</taglib-uri>
+      <taglib-location>/WEB-INF/fmt.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>sql.tld</taglib-uri>
+      <taglib-location>/WEB-INF/sql.tld</taglib-location>
+    </taglib>
+    <taglib>
+      <taglib-uri>x.tld</taglib-uri>
+      <taglib-location>/WEB-INF/x.tld</taglib-location>
+    </taglib>
+
+  </jsp-config>
+
 </web-app>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org