You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/08 10:21:44 UTC
svn commit: r582743 - in /myfaces/orchestra/trunk:
core/src/main/java/org/apache/myfaces/orchestra/conversation/
core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/
core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ core/...
Author: imario
Date: Mon Oct 8 01:21:33 2007
New Revision: 582743
URL: http://svn.apache.org/viewvc?rev=582743&view=rev
Log:
some FA fixes/cleanups
Added:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/LogConversationMessager.java
- copied, changed from r582742, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/BasicConversationMessager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java
- copied, changed from r582742, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/AbstractFrameworkAdapter.java
Removed:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/AbstractFrameworkAdapter.java
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashScopeManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/local/LocalFrameworkAdapter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplication.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplicationFactory.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/SerializableConverter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerManager.java
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/main/java/org/apache/myfaces/orchestra/conversation/spring/AnnotationsInitializer.java
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java
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/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java Mon Oct 8 01:21:33 2007
@@ -21,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.orchestra.frameworkAdapter.AbstractFrameworkAdapter;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.apache.myfaces.orchestra.lib.OrchestraException;
import org.apache.myfaces.orchestra.requestParameterProvider.RequestParameterProviderManager;
@@ -97,7 +96,7 @@
*/
public static ConversationManager getInstance(boolean create)
{
- ConversationManager conversationManager = (ConversationManager) FrameworkAdapter.getInstance().getSessionAttribute(CONVERSATION_MANAGER_KEY);
+ ConversationManager conversationManager = (ConversationManager) FrameworkAdapter.getCurrentInstance().getSessionAttribute(CONVERSATION_MANAGER_KEY);
if (conversationManager == null && create)
{
// TODO: do not call new directly here, as it makes it impossible to configure
@@ -108,7 +107,7 @@
RequestParameterProviderManager.getInstance().register(new ConversationRequestParameterProvider());
// set mark
- FrameworkAdapter.getInstance().setSessionAttribute(CONVERSATION_MANAGER_KEY, conversationManager);
+ FrameworkAdapter.getCurrentInstance().setSessionAttribute(CONVERSATION_MANAGER_KEY, conversationManager);
}
return conversationManager;
@@ -127,12 +126,12 @@
*/
public Long getConversationContextId()
{
- Long conversationContextId = (Long) FrameworkAdapter.getInstance().getRequestAttribute(CONVERSATION_CONTEXT_REQ);
+ Long conversationContextId = (Long) FrameworkAdapter.getCurrentInstance().getRequestAttribute(CONVERSATION_CONTEXT_REQ);
if (conversationContextId == null)
{
- if (FrameworkAdapter.getInstance().containsRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM))
+ if (FrameworkAdapter.getCurrentInstance().containsRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM))
{
- String urlConversationContextId = FrameworkAdapter.getInstance().getRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM).toString();
+ String urlConversationContextId = FrameworkAdapter.getCurrentInstance().getRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM).toString();
conversationContextId = new Long(Long.parseLong(urlConversationContextId, Character.MAX_RADIX));
}
else
@@ -144,7 +143,7 @@
}
}
- FrameworkAdapter.getInstance().setRequestAttribute(CONVERSATION_CONTEXT_REQ, conversationContextId);
+ FrameworkAdapter.getCurrentInstance().setRequestAttribute(CONVERSATION_CONTEXT_REQ, conversationContextId);
}
return conversationContextId;
@@ -307,8 +306,8 @@
{
return
(
- FrameworkAdapter.getInstance().containsRequestAttribute(CONVERSATION_CONTEXT_REQ) ||
- FrameworkAdapter.getInstance().containsRequestParameterAttribute(CONVERSATION_CONTEXT_REQ)) &&
+ FrameworkAdapter.getCurrentInstance().containsRequestAttribute(CONVERSATION_CONTEXT_REQ) ||
+ FrameworkAdapter.getCurrentInstance().containsRequestParameterAttribute(CONVERSATION_CONTEXT_REQ)) &&
getCurrentConversationContext() != null;
}
@@ -324,7 +323,7 @@
*/
public ConversationMessager getMessager()
{
- return FrameworkAdapter.getInstance().getConversationMessager();
+ return FrameworkAdapter.getCurrentInstance().getConversationMessager();
// return conversationMessager;
}
@@ -336,7 +335,7 @@
private static ConversationMessager createMessager()
{
// First try init parameter for backwards compatibility
- AbstractFrameworkAdapter adapter = FrameworkAdapter.getInstance();
+ FrameworkAdapter adapter = FrameworkAdapter.getCurrentInstance();
String conversationMessagerName = adapter.getInitParameter(INIT_MESSAGER);
if (conversationMessagerName != null)
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java Mon Oct 8 01:21:33 2007
@@ -50,7 +50,7 @@
conversation.invalidateAndRestart();
- return FrameworkAdapter.getInstance().getBean(name);
+ return FrameworkAdapter.getCurrentInstance().getBean(name);
}
/**
@@ -66,7 +66,7 @@
currentConversationInfo.getConversation().invalidateAndRestart();
- return FrameworkAdapter.getInstance().getBean(name);
+ return FrameworkAdapter.getCurrentInstance().getBean(name);
}
/**
@@ -81,7 +81,7 @@
{
try
{
- FrameworkAdapter.getInstance().redirect(redirectViewId);
+ FrameworkAdapter.getCurrentInstance().redirect(redirectViewId);
}
catch (IOException e)
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashScopeManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashScopeManager.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashScopeManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashScopeManager.java Mon Oct 8 01:21:33 2007
@@ -46,7 +46,7 @@
//
// Using a lookup of a managed bean allows the user to set configuration properties on the
// manager class and its properties.
- FlashScopeManager manager = (FlashScopeManager) FrameworkAdapter.getInstance().getBean(FlashScopeManager.class.getName());
+ FlashScopeManager manager = (FlashScopeManager) FrameworkAdapter.getCurrentInstance().getBean(FlashScopeManager.class.getName());
if (manager == null)
{
// TODO: Make this error message less spring-specific. Spring is not the only IOC container
Copied: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/LogConversationMessager.java (from r582742, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/BasicConversationMessager.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/LogConversationMessager.java?p2=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/LogConversationMessager.java&p1=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/BasicConversationMessager.java&r1=582742&r2=582743&rev=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/BasicConversationMessager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/basic/LogConversationMessager.java Mon Oct 8 01:21:33 2007
@@ -38,9 +38,9 @@
* <p>
* As required by the ConversationMessager interface, all methods on this class are thread-safe.
*/
-public class BasicConversationMessager extends ConversationMessager
+public class LogConversationMessager extends ConversationMessager
{
- private final Log log = LogFactory.getLog(BasicConversationMessager.class);
+ private final Log log = LogFactory.getLog(LogConversationMessager.class);
public void setConversationException(Throwable t)
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java Mon Oct 8 01:21:33 2007
@@ -107,7 +107,7 @@
if (restart != null && restart.booleanValue())
{
- FrameworkAdapter.getInstance().getBean(conversationName);
+ FrameworkAdapter.getCurrentInstance().getBean(conversationName);
if (restartAction != null)
{
Copied: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java (from r582742, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/AbstractFrameworkAdapter.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java?p2=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java&p1=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/AbstractFrameworkAdapter.java&r1=582742&r2=582743&rev=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/AbstractFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java Mon Oct 8 01:21:33 2007
@@ -34,10 +34,25 @@
* Orchestra locates a concrete implementation of this class by using the FrameworkAdapter class, which supports
* configuration of the actual underlying object returned.
*/
-public abstract class AbstractFrameworkAdapter
+public abstract class FrameworkAdapter
{
private ConversationMessager conversationMessager;
+ private final static ThreadLocal instance = new ThreadLocal();
+
+ /**
+ * Expected to be called only by a servlet filter at the start and end of each request.
+ */
+ public static void setCurrentInstance(FrameworkAdapter frameworkAdapter)
+ {
+ instance.set(frameworkAdapter);
+ }
+
+ public static FrameworkAdapter getCurrentInstance()
+ {
+ return (FrameworkAdapter) instance.get();
+ }
+
public ConversationMessager getConversationMessager()
{
if (conversationMessager == null)
@@ -50,7 +65,7 @@
protected ConversationMessager createConversationMessager()
{
- return null;
+ throw new IllegalStateException("conversation messager configuration missing"); // NON-NLS
}
public void setConversationMessager(ConversationMessager conversationMessager)
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapter.java Mon Oct 8 01:21:33 2007
@@ -21,8 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.orchestra.conversation.ConversationMessager;
-import org.apache.myfaces.orchestra.conversation.basic.BasicConversationMessager;
-import org.apache.myfaces.orchestra.frameworkAdapter.AbstractFrameworkAdapter;
+import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.apache.myfaces.shared_orchestra.util.ClassUtils;
@@ -39,7 +38,7 @@
* This class requires the BasicFrameworkAdapterFilter to be configured to run
* for every request.
*/
-public class BasicFrameworkAdapter extends AbstractFrameworkAdapter
+public class BasicFrameworkAdapter extends FrameworkAdapter
{
private final static String ISE_MESSAGE="No request/response data available"; // NON-NLS
@@ -75,7 +74,7 @@
protected ConversationMessager createDefaultConversationMessager()
{
- return new BasicConversationMessager();
+ return new LogConversationMessager();
}
private HttpServletRequest getRequest()
@@ -100,13 +99,13 @@
httpServletResponse.set(rsp);
}
- FrameworkAdapter.setInstance(this);
+ FrameworkAdapter.setCurrentInstance(this);
}
public void endRequest()
{
log.debug("Ending request");
- FrameworkAdapter.setInstance(null);
+ FrameworkAdapter.setCurrentInstance(null);
httpServletRequest.set(null);
httpServletResponse.set(null);
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/local/LocalFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/local/LocalFrameworkAdapter.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/local/LocalFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/local/LocalFrameworkAdapter.java Mon Oct 8 01:21:33 2007
@@ -22,7 +22,7 @@
*/
package org.apache.myfaces.orchestra.frameworkAdapter.local;
-import org.apache.myfaces.orchestra.frameworkAdapter.AbstractFrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.ApplicationContext;
@@ -58,7 +58,7 @@
* Note also that because this is intended for use only without a real request
* and response, there is no corresponding Filter class.
*/
-public class LocalFrameworkAdapter extends AbstractFrameworkAdapter implements ApplicationContextAware
+public class LocalFrameworkAdapter extends FrameworkAdapter implements ApplicationContextAware
{
private ConfigurableApplicationContext configurableApplicationContext;
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplication.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplication.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplication.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplication.java Mon Oct 8 01:21:33 2007
@@ -75,7 +75,7 @@
catch (FacesException e)
{
// looks like there is no converter configured, try to find a spring-configured one
- Converter converter = (Converter) FrameworkAdapter.getInstance().getBean(converterId);
+ Converter converter = (Converter) FrameworkAdapter.getCurrentInstance().getBean(converterId);
if (converter == null)
{
// no spring converter ... now re-throw the exception
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplicationFactory.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplicationFactory.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraApplicationFactory.java Mon Oct 8 01:21:33 2007
@@ -66,7 +66,7 @@
catch (FacesException e)
{
// looks like there is no converter configured, try to find a spring-configured one
- Converter converter = (Converter) FrameworkAdapter.getInstance().getBean(converterId);
+ Converter converter = (Converter) FrameworkAdapter.getCurrentInstance().getBean(converterId);
if (converter == null)
{
// no spring converter ... now re-throw the exception
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/SerializableConverter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/SerializableConverter.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/SerializableConverter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/SerializableConverter.java Mon Oct 8 01:21:33 2007
@@ -51,7 +51,7 @@
{
if (this.converter == null)
{
- this.converter = (Converter) FrameworkAdapter.getInstance().getBean(this.converterId);
+ this.converter = (Converter) FrameworkAdapter.getCurrentInstance().getBean(this.converterId);
}
return this.converter;
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java Mon Oct 8 01:21:33 2007
@@ -22,7 +22,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
-import org.apache.myfaces.orchestra.frameworkAdapter.AbstractFrameworkAdapter;
import java.io.Serializable;
import java.util.ArrayList;
@@ -67,13 +66,13 @@
public static RequestParameterProviderManager getInstance()
{
RequestParameterProviderManager manager =
- (RequestParameterProviderManager) FrameworkAdapter.getInstance().getSessionAttribute(PARAMETER_PROVIDER_MANAGER_KEY);
+ (RequestParameterProviderManager) FrameworkAdapter.getCurrentInstance().getSessionAttribute(PARAMETER_PROVIDER_MANAGER_KEY);
if (manager == null)
{
// TODO: remove this factory code. Not IOC-friendly.
manager = new RequestParameterProviderManager();
- FrameworkAdapter.getInstance().setSessionAttribute(PARAMETER_PROVIDER_MANAGER_KEY, manager);
+ FrameworkAdapter.getCurrentInstance().setSessionAttribute(PARAMETER_PROVIDER_MANAGER_KEY, manager);
}
return manager;
@@ -146,7 +145,7 @@
protected boolean isResponseIntercepted()
{
- AbstractFrameworkAdapter fa = FrameworkAdapter.getInstance();
+ FrameworkAdapter fa = FrameworkAdapter.getCurrentInstance();
return Boolean.TRUE.equals(fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED))
|| Boolean.TRUE.equals(fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_RESPONSE_WRAPPED));
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerManager.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerManager.java Mon Oct 8 01:21:33 2007
@@ -44,7 +44,7 @@
return null;
}
- return FrameworkAdapter.getInstance().getBean(beanName);
+ return FrameworkAdapter.getCurrentInstance().getBean(beanName);
}
public void assertConversationState(String viewId)
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=582743&r1=582742&r2=582743&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 Mon Oct 8 01:21:33 2007
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.orchestra.conversation;
-import org.apache.myfaces.orchestra.conversation.basic.BasicConversationMessager;
+import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
import org.springframework.aop.scope.ScopedObject;
@@ -47,14 +47,14 @@
LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
frameworkAdapter.setApplicationContext(applicationContext);
- FrameworkAdapter.setInstance(frameworkAdapter);
+ FrameworkAdapter.setCurrentInstance(frameworkAdapter);
}
public void testConversation() throws Exception
{
DummyBean.callback=this;
final String BEAN_NAME = "dummyBean";
-
+
// The Spring configuration for dummyBean does not explicitly set a conversation name,
// so conversation-name = bean-name
final String CONVERSATION_NAME = BEAN_NAME;
@@ -64,7 +64,7 @@
Object msgr = applicationContext.getBean(ConversationMessager.class.getName());
assertNotNull(msgr);
- assertTrue(msgr instanceof BasicConversationMessager);
+ 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=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core/src/test/resources/testApplicationContext.xml Mon Oct 8 01:21:33 2007
@@ -51,7 +51,7 @@
<!-- 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"/>
+ class="org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager"/>
<bean
name="dummyBean"
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AnnotationsInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AnnotationsInitializer.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AnnotationsInitializer.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AnnotationsInitializer.java Mon Oct 8 01:21:33 2007
@@ -42,7 +42,7 @@
private Log log = LogFactory.getLog(AnnotationsInitializer.class);
private final static String MY_BEAN_NAME = AnnotationsInitializer.class.getName();
-
+
private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered
private Map<String, AnnotationInfo> annotationsInfoByName = new HashMap<String, AnnotationInfo>();
@@ -102,9 +102,9 @@
public static AnnotationsInitializer getInstance()
{
- return (AnnotationsInitializer) FrameworkAdapter.getInstance().getBean(MY_BEAN_NAME);
+ return (AnnotationsInitializer) FrameworkAdapter.getCurrentInstance().getBean(MY_BEAN_NAME);
}
-
+
protected void addAnnotationsInfo(AnnotationInfo annotationInfo)
{
annotationsInfoByName.put(annotationInfo.getBeanName(), annotationInfo);
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java?rev=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java Mon Oct 8 01:21:33 2007
@@ -117,7 +117,7 @@
{
try
{
- FrameworkAdapter.getInstance().redirect(conversationRequire.redirect());
+ FrameworkAdapter.getCurrentInstance().redirect(conversationRequire.redirect());
}
catch (IOException e)
{
@@ -129,7 +129,7 @@
try
{
String dst = conversationRequire.navigationAction();
- FrameworkAdapter.getInstance().invokeNavigation(dst);
+ FrameworkAdapter.getCurrentInstance().invokeNavigation(dst);
}
catch (IOException e)
{
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=582743&r1=582742&r2=582743&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 Mon Oct 8 01:21:33 2007
@@ -42,7 +42,7 @@
LocalFrameworkAdapter frameworkAdapter = new LocalFrameworkAdapter();
frameworkAdapter.setApplicationContext(applicationContext);
- FrameworkAdapter.setInstance(frameworkAdapter);
+ FrameworkAdapter.setCurrentInstance(frameworkAdapter);
}
public void testPersistence()
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=582743&r1=582742&r2=582743&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml (original)
+++ myfaces/orchestra/trunk/core15/src/test/resources/testApplicationContext.xml Mon Oct 8 01:21:33 2007
@@ -84,7 +84,7 @@
<!-- 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"/>
+ class="org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager"/>
<bean
name="persistentConversation"