You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2007/09/07 23:20:32 UTC

svn commit: r573716 - /myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml

Author: skitching
Date: Fri Sep  7 14:20:32 2007
New Revision: 573716

URL: http://svn.apache.org/viewvc?rev=573716&view=rev
Log:
Fix standard conversation names: lifetimes are "manual/flash" not "normal/flash"

Modified:
    myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml

Modified: myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml?rev=573716&r1=573715&r2=573716&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/applicationContext.xml Fri Sep  7 14:20:32 2007
@@ -35,7 +35,7 @@
 	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
 		<property name="scopes">
 			<map>
-				<entry key="conversation.normal">
+				<entry key="conversation.manual">
 					<bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope">
 						<property name="timeout" value="35" />
 
@@ -197,7 +197,7 @@
 	<bean
 		name="configuratorData"
 		class="org.apache.myfaces.examples.configurator.backings.ConfiguratorData"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		autowire="byName">
 
 		<aop:scoped-proxy/>
@@ -206,7 +206,7 @@
 	<bean
 		name="configuratorCustomer"
 		class="org.apache.myfaces.examples.configurator.backings.Customer"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		autowire="byName">
 
 		<aop:scoped-proxy/>
@@ -293,7 +293,7 @@
 	<bean
 		name="ballotVoter"
 		class="org.apache.myfaces.examples.ballot.backings.BallotVoter"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		autowire="byName">
 
 		<aop:scoped-proxy/>
@@ -303,7 +303,7 @@
 	<bean
 		name="bean1"
 		class="org.apache.myfaces.examples.multibean.Bean1"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		orchestra:conversationName="multibean">
 
 		<aop:scoped-proxy/>
@@ -313,7 +313,7 @@
 	<bean
 		name="bean2"
 		class="org.apache.myfaces.examples.multibean.Bean2"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		orchestra:conversationName="multibean">
 
 		<aop:scoped-proxy/>
@@ -323,7 +323,7 @@
 	<bean
 		name="multiViewController"
 		class="org.apache.myfaces.examples.annotations.MultiViewController"
-		scope="conversation.normal">
+		scope="conversation.manual">
 
 		<aop:scoped-proxy/>
 
@@ -367,7 +367,7 @@
 	<bean
 		name="petstoreData"
 		class="org.apache.myfaces.examples.mops.backings.PetstoreData"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		orchestra:conversationName="petstoreConversation"
 		autowire="byName">
 
@@ -377,7 +377,7 @@
 	<bean
 		name="mopsSecurity"
 		class="org.apache.myfaces.examples.mops.backings.Security"
-		scope="conversation.normal"
+		scope="conversation.manual"
 		orchestra:conversationName="petstoreConversation">
 
 		<aop:scoped-proxy/>