portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r695799 - /portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
Date Tue, 16 Sep 2008 09:58:43 GMT
Author: ate
Date: Tue Sep 16 02:58:42 2008
New Revision: 695799

URL: http://svn.apache.org/viewvc?rev=695799&view=rev
Log:
Converting j2-admin web.xml to Servlet API 2.4 schema

Modified:
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
  (contents, props changed)

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml?rev=695799&r1=695798&r2=695799&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
(original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
Tue Sep 16 02:58:42 2008
@@ -1,227 +1,230 @@
-<?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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>Jetspeed-2 Portal Administration Portlets</display-name>
-    <description>Administration Portlets for the Jetspeed-2 Enterprise Portal</description>
-
-	<context-param>
-    	<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    	<param-value>server</param-value>
-	</context-param>
-	<context-param>
-    	<param-name>javax.faces.application.CONFIG_FILES</param-name>
-    	<param-value>/WEB-INF/faces-config.xml</param-value>
-  	</context-param>
-   	<context-param>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-        <description>
-            This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "true"
-        </description>
-    </context-param>
-    
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-        <description>
-            This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "false"
-
-            Setting this param to true should be combined with STATE_SAVING_METHOD "server"
for
-            best results.
-
-            This is an EXPERIMENTAL feature. You also have to enable the detector filter/filter
mapping below to get
-            JavaScript detection working.
-        </description>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-        <description>
-            If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"
-        </description>
-    </context-param>
-  
-    <context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>org.apache.portals.applications.j2-admin</param-value>
-	</context-param>
-
-    <context-param>
-        <param-name>log4jConfigLocation</param-name>
-        <param-value>/WEB-INF/classes/log4j.properties</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>WicketUserBrowserApplication</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.security.users.WicketUserBrowserApplication</param-value>
-      </init-param>
-    </filter>
-
-    <filter>
-      <filter-name>WicketUserDetailsApplication</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.security.users.WicketUserDetailsApplication</param-value>
-      </init-param>
-    </filter>
-    
-    <filter-mapping>
-      <filter-name>WicketUserBrowserApplication</filter-name>
-      <url-pattern>/userbrowser/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-    
-    <filter-mapping>
-      <filter-name>WicketUserDetailsApplication</filter-name>
-      <url-pattern>/userdetails/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>
-    
-    <listener>
-      <listener-class>org.apache.jetspeed.webapp.logging.Log4JConfigurator</listener-class>
-    </listener>
-    
-  	<!-- Listener, that does all the startup work (configuration, init). -->
-  	<listener>
-    	<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  	</listener>
-
-    <listener>
-		<listener-class>org.springframework.web.util.WebAppRootListener</listener-class>
-	</listener>
-
-    <listener>
-        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-    </listener>
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-  
-  	<!-- Faces Servlet -->
-  	<servlet>
-    	<servlet-name>Faces Servlet</servlet-name>
-    	<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    	<load-on-startup>1</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>
-    <servlet-name>JetspeedContainer</servlet-name>
-    <display-name>Jetspeed Container</display-name>
-    <description>MVC Servlet for Jetspeed Portlet Applications</description>
-    <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-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>
-
-  	<!-- extension mapping -->
-  	<servlet-mapping>
-  		<servlet-name>Faces Servlet</servlet-name>
-   		<url-pattern>*.jsf</url-pattern>
-  	</servlet-mapping>
-
-	<!-- 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>
-  
-</web-app>
+<?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>
+
+	<context-param>
+    	<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+    	<param-value>server</param-value>
+	</context-param>
+	<context-param>
+    	<param-name>javax.faces.application.CONFIG_FILES</param-name>
+    	<param-value>/WEB-INF/faces-config.xml</param-value>
+  	</context-param>
+   	<context-param>
+        <description>
+            This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "true"
+        </description>
+        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    
+    <context-param>
+        <description>
+            This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "false"
+
+            Setting this param to true should be combined with STATE_SAVING_METHOD "server"
for
+            best results.
+
+            This is an EXPERIMENTAL feature. You also have to enable the detector filter/filter
mapping below to get
+            JavaScript detection working.
+        </description>
+        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <context-param>
+        <description>
+            If true, rendered HTML code will be formatted, so that it is "human readable".
+            i.e. additional line separators and whitespace will be written, that do not
+            influence the HTML code.
+            Default: "true"
+        </description>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+    </context-param>
+  
+    <context-param>
+		<param-name>webAppRootKey</param-name>
+		<param-value>org.apache.portals.applications.j2-admin</param-value>
+	</context-param>
+
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>/WEB-INF/classes/log4j.properties</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>WicketUserBrowserApplication</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.security.users.WicketUserBrowserApplication</param-value>
+      </init-param>
+    </filter>
+
+    <filter>
+      <filter-name>WicketUserDetailsApplication</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.security.users.WicketUserDetailsApplication</param-value>
+      </init-param>
+    </filter>
+    
+    <filter-mapping>
+      <filter-name>WicketUserBrowserApplication</filter-name>
+      <url-pattern>/userbrowser/*</url-pattern>
+      <dispatcher>REQUEST</dispatcher>
+      <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    
+    <filter-mapping>
+      <filter-name>WicketUserDetailsApplication</filter-name>
+      <url-pattern>/userdetails/*</url-pattern>
+      <dispatcher>REQUEST</dispatcher>
+      <dispatcher>INCLUDE</dispatcher>
+    </filter-mapping>
+    
+    <listener>
+      <listener-class>org.apache.jetspeed.webapp.logging.Log4JConfigurator</listener-class>
+    </listener>
+    
+  	<!-- Listener, that does all the startup work (configuration, init). -->
+  	<listener>
+    	<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+  	</listener>
+
+    <listener>
+		<listener-class>org.springframework.web.util.WebAppRootListener</listener-class>
+	</listener>
+
+    <listener>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+  
+  	<!-- Faces Servlet -->
+  	<servlet>
+    	<servlet-name>Faces Servlet</servlet-name>
+    	<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    	<load-on-startup>1</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>
+    <init-param>
+      <param-name>contextName</param-name>
+      <param-value>j2-admin</param-value>
+    </init-param>
+    <load-on-startup>100</load-on-startup>
+   </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>
+
+  	<!-- extension mapping -->
+  	<servlet-mapping>
+  		<servlet-name>Faces Servlet</servlet-name>
+   		<url-pattern>*.jsf</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>

Propchange: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Id



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


Mime
View raw message