svn commit: r574292 - in /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra: conversation/jsf/filter/ frameworkAdapter/ frameworkAdapter/jsf/

[sk...@apache.org]

Author: skitching
Date: Mon Sep 10 09:07:54 2007
New Revision: 574292

URL: http://svn.apache.org/viewvc?rev=574292&view=rev
Log:
Move FrameworkAdapterServletFilter up out of the "jsf" subpackage; it is not jsf-specific.

Added:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterServletFilter.java
      - copied, changed from r574272, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/FrameworkAdapterServletFilter.java
Removed:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/FrameworkAdapterServletFilter.java
Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/filter/OrchestraServletFilter.java
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapter.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/filter/OrchestraServletFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/filter/OrchestraServletFilter.java?rev=574292&r1=574291&r2=574292&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/filter/OrchestraServletFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/filter/OrchestraServletFilter.java Mon Sep 10 09:07:54 2007
@@ -22,7 +22,7 @@
 import org.apache.myfaces.orchestra.connectionManager.ConnectionManagerDataSource;
 import org.apache.myfaces.orchestra.conversation.ConversationContext;
 import org.apache.myfaces.orchestra.conversation.ConversationManager;
-import org.apache.myfaces.orchestra.frameworkAdapter.jsf.FrameworkAdapterServletFilter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapterServletFilter;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

Copied: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterServletFilter.java (from r574272, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/FrameworkAdapterServletFilter.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterServletFilter.java?p2=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterServletFilter.java&p1=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/FrameworkAdapterServletFilter.java&r1=574272&r2=574292&rev=574292&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/FrameworkAdapterServletFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterServletFilter.java Mon Sep 10 09:07:54 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.orchestra.frameworkAdapter.jsf;
+package org.apache.myfaces.orchestra.frameworkAdapter;
 
 import java.io.IOException;
 
@@ -31,9 +31,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
-import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapterInterface;
-
 /**
  * Perform a number of useful per-request tasks.
  * <p>
@@ -61,7 +58,8 @@
 	public final static String FRAMEWORK_ADAPTER_KEY = "org.apache.myfaces.orchestra.FRAMEWORK_ADAPTER_CLASS"; // NON-NLS
 
 	/** The default value for FRAMEWORK_ADAPTER_KEY. */
-	public final static String FRAMEWORK_ADAPTER_DFLT = JsfFrameworkAdapter.class.getName();
+	public final static String FRAMEWORK_ADAPTER_DFLT = 
+		"org.apache.myfaces.orchestra.frameworkAdapter.jsf.JsfFrameworkAdapter";
 
 	private static ThreadLocal httpServletRequest = new ThreadLocal();
 	private static ThreadLocal httpServletResponse = new ThreadLocal();
@@ -111,12 +109,12 @@
 		}
 	}
 
-	static HttpServletRequest getHttpServletRequest()
+	public static HttpServletRequest getHttpServletRequest()
 	{
 		return (HttpServletRequest) httpServletRequest.get();
 	}
 
-	static HttpServletResponse getHttpServletResponse()
+	public static HttpServletResponse getHttpServletResponse()
 	{
 		return (HttpServletResponse) httpServletResponse.get();
 	}

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapter.java?rev=574292&r1=574291&r2=574292&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapter.java Mon Sep 10 09:07:54 2007
@@ -21,6 +21,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapterInterface;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapterServletFilter;
 
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletContext;