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/10/09 09:53:32 UTC
svn commit: r583066 - in /myfaces/orchestra/trunk:
core/src/test/java/org/apache/myfaces/orchestra/conversation/
core/src/test/resources/
core15/src/test/java/org/apache/myfaces/orchestra/conversation/
core15/src/test/resources/
Author: skitching
Date: Tue Oct 9 00:53:31 2007
New Revision: 583066
URL: http://svn.apache.org/viewvc?rev=583066&view=rev
Log:
LocalFrameworkAdapter now requires the messager instance to be explicitly set via a call to the setter method.
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/java/org/apache/myfaces/orchestra/conversation/TestConversationPersistence.java
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=583066&r1=583065&r2=583066&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 Tue Oct 9 00:53:31 2007
@@ -47,6 +47,7 @@
LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
}
@@ -61,10 +62,6 @@
valueBoundCount = 0;
valueUnboundCount = 0;
-
- Object msgr = applicationContext.getBean(ConversationMessager.class.getName());
- assertNotNull(msgr);
- assertTrue(msgr instanceof LogConversationMessager);
/* 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=583066&r1=583065&r2=583066&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml Tue Oct 9 00:53:31 2007
@@ -48,11 +48,6 @@
<!-- 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.LogConversationMessager"/>
-
<bean
name="dummyBean"
class="org.apache.myfaces.orchestra.conversation.DummyBean"
Modified: myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversationPersistence.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversationPersistence.java?rev=583066&r1=583065&r2=583066&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversationPersistence.java (original)
+++ myfaces/orchestra/trunk/core15/src/test/java/org/apache/myfaces/orchestra/conversation/TestConversationPersistence.java Tue Oct 9 00:53:31 2007
@@ -18,10 +18,11 @@
*/
package org.apache.myfaces.orchestra.conversation;
-import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
+import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
+import org.apache.myfaces.orchestra.conversation.model.UserData;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
-import org.apache.myfaces.orchestra.conversation.model.UserData;
+import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
/**
* Test various aspects of the conversation handling
@@ -42,6 +43,7 @@
LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
frameworkAdapter.setApplicationContext(applicationContext);
+ frameworkAdapter.setConversationMessager(new LogConversationMessager());
FrameworkAdapter.setCurrentInstance(frameworkAdapter);
}
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=583066&r1=583065&r2=583066&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml Tue Oct 9 00:53:31 2007
@@ -81,11 +81,6 @@
<!-- 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.LogConversationMessager"/>
-
<bean
name="persistentConversation"
class="org.apache.myfaces.orchestra.conversation.PersistentConversation"