You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/05/25 18:55:06 UTC

svn commit: r1127581 - in /myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF: examples-config.xml examples-springConfig.xml web.xml

Author: lu4242
Date: Wed May 25 16:55:05 2011
New Revision: 1127581

URL: http://svn.apache.org/viewvc?rev=1127581&view=rev
Log:
remove spring stuff moved to orchestra

Removed:
    myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-springConfig.xml
Modified:
    myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-config.xml
    myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-config.xml?rev=1127581&r1=1127580&r2=1127581&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/examples-config.xml Wed May 25 16:55:05 2011
@@ -647,10 +647,6 @@
         <!--</view-handler>-->
     <!--</application>-->
 
-	<application>
-		<variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
-	</application>
-
 	<converter>
         <converter-id>inputSuggestAjaxConverter</converter-id>
         <converter-class>org.apache.myfaces.examples.inputSuggestAjax.InputSuggestAjaxConverter</converter-class>

Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/web.xml?rev=1127581&r1=1127580&r2=1127581&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/WEB-INF/web.xml Wed May 25 16:55:05 2011
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4" id="WebApp_ID">
-<listener>
-  <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-</listener>
-  <listener>
-    <listener-class> org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
-  </listener>
 
   <description>debug web.xml</description>
   <display-name>
@@ -156,10 +147,6 @@
       <param-value>100k</param-value>
     </init-param>
   </filter>
-  <filter>
-  	<filter-name>conversationFilter</filter-name>
-  	<filter-class>org.apache.myfaces.custom.conversation.ConversationServletFilter</filter-class>
-  </filter>
   <filter-mapping>
     <filter-name>extensionsFilter</filter-name>
     <url-pattern>*.jsf</url-pattern>
@@ -172,10 +159,6 @@
     <filter-name>extensionsFilter</filter-name>
     <url-pattern>/faces/*</url-pattern>
   </filter-mapping>
-  <filter-mapping>
-    <filter-name>conversationFilter</filter-name>
-    <url-pattern>*.jsf</url-pattern>
-  </filter-mapping>
   
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>