myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r582281 - in /myfaces/orchestra/trunk: core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java core/src/test/resources/testApplicationContext.xml core15/src/test/resources/testApplicationContext.xml
Date Fri, 05 Oct 2007 14:11:53 GMT
Author: skitching
Date: Fri Oct  5 07:11:52 2007
New Revision: 582281

URL: http://svn.apache.org/viewvc?rev=582281&view=rev
Log:
Handle fact that ConversationMessager now needs to be explicitly configured when using the
LocalFrameworkAdapter.

Modified:
    myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
    myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml
    myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml

Modified: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java?rev=582281&r1=582280&r2=582281&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
(original)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversation.java
Fri Oct  5 07:11:52 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.orchestra.conversation;
 
+import org.apache.myfaces.orchestra.conversation.basic.BasicConversationMessager;
 import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
 import org.springframework.aop.scope.ScopedObject;
@@ -60,6 +61,10 @@
 
 		valueBoundCount = 0;
 		valueUnboundCount = 0;
+
+		Object msgr =  applicationContext.getBean(ConversationMessager.class.getName());
+		assertNotNull(msgr);
+		assertTrue(msgr instanceof BasicConversationMessager);
 
 		/* simple create test */
 		DummyBean bean = (DummyBean) applicationContext.getBean(BEAN_NAME);

Modified: myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml?rev=582281&r1=582280&r2=582281&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml Fri Oct  5
07:11:52 2007
@@ -48,6 +48,11 @@
 
 	<!-- our beans -->
 
+	<!-- ConversationMessager def needed because we are using the special LocalFrameworkAdapter.
-->
+	<bean
+		name="org.apache.myfaces.orchestra.conversation.ConversationMessager"
+		class="org.apache.myfaces.orchestra.conversation.basic.BasicConversationMessager"/>
+
 	<bean
 		name="dummyBean"
 		class="org.apache.myfaces.orchestra.conversation.DummyBean"

Modified: myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml?rev=582281&r1=582280&r2=582281&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml Fri Oct 
5 07:11:52 2007
@@ -81,6 +81,11 @@
 
 	<!-- our beans -->
 
+	<!-- ConversationMessager def needed because we are using the special LocalFrameworkAdapter.
-->
+	<bean
+		name="org.apache.myfaces.orchestra.conversation.ConversationMessager"
+		class="org.apache.myfaces.orchestra.conversation.basic.BasicConversationMessager"/>
+
 	<bean
 		name="persistentConversation"
 		class="org.apache.myfaces.orchestra.conversation.PersistentConversation"



Mime
View raw message