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/03/20 22:01:37 UTC

svn commit: r520585 - in /myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra: ./ conversation/ conversation/jsf/ conversation/jsf/components/ conversation/jsf/lib/ conversation/spring/ frameworkAdapter/ requestParameterProvider/ urlPa...

Author: imario
Date: Tue Mar 20 14:01:32 2007
New Revision: 520585

URL: http://svn.apache.org/viewvc?view=rev&rev=520585
Log:
renamed project fusion to orchestra

Added:
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/
      - copied from r520566, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/
      - copied from r520584, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/
      - copied from r520584, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/frameworkAdapter/
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/
      - copied from r520584, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/requestParameterProvider/
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/
      - copied from r520584, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/urlParamNav/
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/
      - copied from r520584, myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/viewController/
Modified:
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationAware.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingEvent.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingListener.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationMessager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/CurrentConversationAdvice.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/DefaultConversationMessager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/JsfConversationUtils.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationActionListener.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationComponent.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/EndConversationTag.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/lib/EndConversationMethodBindingFacade.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContext.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextCloser.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextFactory.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/_SpringUtils.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProvider.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/ExternalContextWrapper.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/FacesContextWrapper.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterNavigationHandler.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterViewHandler.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerExecutor.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerNameMapper.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/InterfaceViewControllerExecutor.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ReflectiveViewControllerExecutor.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewController.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerNameMapper.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerPhaseListener.java
    myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/_ViewControllerUtils.java

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.fusion.conversation.spring.ConversationPolicy;
+import org.apache.myfaces.orchestra.conversation.spring.ConversationPolicy;
 
 import java.util.Map;
 import java.util.TreeMap;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationAware.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationAware.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationAware.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationAware.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 /**
  * Beans implementing this interface will get the conversation object set

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingEvent.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingEvent.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingEvent.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingEvent.java Tue Mar 20 14:01:32 2007
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 /**
  * Events of this type are sent to an object that implements the
- * {@link org.apache.myfaces.fusion.conversation.ConversationBindingListener}
+ * {@link org.apache.myfaces.orchestra.conversation.ConversationBindingListener}
  * interface
  */
 public class ConversationBindingEvent

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingListener.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingListener.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingListener.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationBindingListener.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 /**
  * all beans implementing this listener will get informed if a conversation ends

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.fusion.conversation.spring.ConversationPolicy;
+import org.apache.myfaces.orchestra.conversation.spring.ConversationPolicy;
 
 import java.util.Map;
 import java.util.TreeMap;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java Tue Mar 20 14:01:32 2007
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.fusion.conversation.spring._SpringUtils;
-import org.apache.myfaces.fusion.conversation.spring.ConversationPolicy;
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
-import org.apache.myfaces.fusion.requestParameterProvider.RequestParameterProviderManager;
-import org.apache.myfaces.shared_fusion.util.ClassUtils;
+import org.apache.myfaces.orchestra.conversation.spring._SpringUtils;
+import org.apache.myfaces.orchestra.conversation.spring.ConversationPolicy;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.requestParameterProvider.RequestParameterProviderManager;
+import org.apache.myfaces.shared_orchestra.util.ClassUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationMessager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationMessager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationMessager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationMessager.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import javax.faces.context.FacesContext;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java Tue Mar 20 14:01:32 2007
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
-import org.apache.myfaces.fusion.conversation.jsf.components.UISeparateConversationContext;
-import org.apache.myfaces.fusion.requestParameterProvider.RequestParameterProvider;
+import org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext;
+import org.apache.myfaces.orchestra.requestParameterProvider.RequestParameterProvider;
 
 /**
  * adds the required fields (conversationContext) to the request parameters.

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationUtils.java Tue Mar 20 14:01:32 2007
@@ -21,9 +21,9 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 
 import java.io.IOException;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/CurrentConversationAdvice.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/CurrentConversationAdvice.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/CurrentConversationAdvice.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/CurrentConversationAdvice.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/DefaultConversationMessager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/DefaultConversationMessager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/DefaultConversationMessager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/DefaultConversationMessager.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java Tue Mar 20 14:01:32 2007
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 
 import java.util.Set;
 import java.util.TreeSet;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/_ConversationUtils.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation;
+package org.apache.myfaces.orchestra.conversation;
 
-import org.apache.myfaces.fusion.conversation.jsf.components.AbstractConversationComponent;
-import org.apache.myfaces.fusion.conversation.jsf.components.UIEndConversation;
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.conversation.jsf.components.AbstractConversationComponent;
+import org.apache.myfaces.orchestra.conversation.jsf.components.UIEndConversation;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 
 import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java Tue Mar 20 14:01:32 2007
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf;
+package org.apache.myfaces.orchestra.conversation.jsf;
 
-import org.apache.myfaces.fusion.conversation.ConversationManager;
-import org.apache.myfaces.fusion.conversation.Conversation;
-import org.apache.myfaces.fusion.conversation.FlashManager;
-import org.apache.myfaces.fusion.conversation.spring.ConversationPolicy;
+import org.apache.myfaces.orchestra.conversation.ConversationManager;
+import org.apache.myfaces.orchestra.conversation.Conversation;
+import org.apache.myfaces.orchestra.conversation.FlashManager;
+import org.apache.myfaces.orchestra.conversation.spring.ConversationPolicy;
 
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * invalidates any conversation with policy {@link org.apache.myfaces.fusion.conversation.spring.ConversationPolicy#FLASH}
+	 * invalidates any conversation with policy {@link org.apache.myfaces.orchestra.conversation.spring.ConversationPolicy#FLASH}
 	 * not accessed during a http request
 	 */
 	protected void invalidateFlashConversations()

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/JsfConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/JsfConversationUtils.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/JsfConversationUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/JsfConversationUtils.java Tue Mar 20 14:01:32 2007
@@ -21,9 +21,9 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf;
+package org.apache.myfaces.orchestra.conversation.jsf;
 
-import org.apache.myfaces.fusion.conversation.ConversationManager;
+import org.apache.myfaces.orchestra.conversation.ConversationManager;
 
 import javax.faces.context.FacesContext;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationActionListener.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationActionListener.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationActionListener.java Tue Mar 20 14:01:32 2007
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
-import org.apache.myfaces.fusion.conversation._ConversationUtils;
+import org.apache.myfaces.orchestra.conversation._ConversationUtils;
 
 import javax.faces.component.StateHolder;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationComponent.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationComponent.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationComponent.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationComponent.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
 import javax.faces.component.UICommand;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java Tue Mar 20 14:01:32 2007
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
-import org.apache.myfaces.shared_fusion.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared_orchestra.taglib.UIComponentTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/EndConversationTag.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/EndConversationTag.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/EndConversationTag.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/EndConversationTag.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
 import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
@@ -25,7 +25,7 @@
 /**
  * End a conversation.
  *
- * @see org.apache.myfaces.fusion.conversation.jsf.components.UIEndConversation
+ * @see org.apache.myfaces.orchestra.conversation.jsf.components.UIEndConversation
  */
 public class EndConversationTag extends AbstractConversationTag
 {

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java Tue Mar 20 14:01:32 2007
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
-import org.apache.myfaces.shared_fusion.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared_orchestra.taglib.UIComponentTagBase;
 
 /**
  * Embedded links will start a new conversation context
  *
- * @see org.apache.myfaces.fusion.conversation.jsf.components.UISeparateConversationContext
+ * @see org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext
  */
 public class SeparateConversationContextTag extends UIComponentTagBase
 {

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
-import org.apache.myfaces.fusion.conversation._ConversationUtils;
-import org.apache.myfaces.fusion.conversation.jsf.lib.EndConversationMethodBindingFacade;
-import org.apache.myfaces.shared_fusion.util.StringUtils;
+import org.apache.myfaces.orchestra.conversation._ConversationUtils;
+import org.apache.myfaces.orchestra.conversation.jsf.lib.EndConversationMethodBindingFacade;
+import org.apache.myfaces.shared_orchestra.util.StringUtils;
 
 import javax.faces.component.UICommand;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java Tue Mar 20 14:01:32 2007
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.components;
+package org.apache.myfaces.orchestra.conversation.jsf.components;
 
-import org.apache.myfaces.shared_fusion.renderkit.RendererUtils;
+import org.apache.myfaces.shared_orchestra.renderkit.RendererUtils;
 
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/lib/EndConversationMethodBindingFacade.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/lib/EndConversationMethodBindingFacade.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/lib/EndConversationMethodBindingFacade.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/lib/EndConversationMethodBindingFacade.java Tue Mar 20 14:01:32 2007
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.jsf.lib;
+package org.apache.myfaces.orchestra.conversation.jsf.lib;
 
-import org.apache.myfaces.fusion.conversation.ConversationManager;
-import org.apache.myfaces.fusion.conversation._ConversationUtils;
+import org.apache.myfaces.orchestra.conversation.ConversationManager;
+import org.apache.myfaces.orchestra.conversation._ConversationUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.StateHolder;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java Tue Mar 20 14:01:32 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
 /**
  * configuration for the scope of the conversation
@@ -26,7 +26,7 @@
 	/**
 	 * a conversation with MANUAL policy will end when:
 	 * <ul>
-	 * <li>using the conversation API (e.g. {@link org.apache.myfaces.fusion.conversation.Conversation#invalidate()}</li>
+	 * <li>using the conversation API (e.g. {@link org.apache.myfaces.orchestra.conversation.Conversation#invalidate()}</li>
 	 * <li>reach a timeout</li>
 	 * </ul>
 	 */
@@ -36,7 +36,7 @@
 	 * a conversation with FLASH policy will end when:
 	 * <ul>
 	 * <li>leaving a page which didn't request a bean in the conversation</li>
-	 * <li>using the conversation API (e.g. {@link org.apache.myfaces.fusion.conversation.Conversation#invalidate()}</li>
+	 * <li>using the conversation API (e.g. {@link org.apache.myfaces.orchestra.conversation.Conversation#invalidate()}</li>
 	 * <li>reach a timeout</li>
 	 * </ul>
 	 */

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContext.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContext.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContext.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContext.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
 /**
  * Interface which will be used by the {@link PersistenceContextConversationInterceptor}

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextCloser.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextCloser.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextCloser.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextCloser.java Tue Mar 20 14:01:32 2007
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
-import org.apache.myfaces.fusion.conversation.ConversationBindingEvent;
-import org.apache.myfaces.fusion.conversation.ConversationBindingListener;
+import org.apache.myfaces.orchestra.conversation.ConversationBindingEvent;
+import org.apache.myfaces.orchestra.conversation.ConversationBindingListener;
 
 public class PersistenceContextCloser implements ConversationBindingListener
 {

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.myfaces.fusion.conversation.Conversation;
+import org.apache.myfaces.orchestra.conversation.Conversation;
 
 /**
  * <p/>

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextFactory.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextFactory.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextFactory.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
 /**
  * The factory is responsible for creating a {@link PersistenceContext}

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java Tue Mar 20 14:01:32 2007
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
 import org.aopalliance.aop.Advice;
-import org.apache.myfaces.fusion.conversation.Conversation;
-import org.apache.myfaces.fusion.conversation.ConversationAware;
-import org.apache.myfaces.fusion.conversation.ConversationBindingEvent;
-import org.apache.myfaces.fusion.conversation.ConversationBindingListener;
-import org.apache.myfaces.fusion.conversation.ConversationManager;
-import org.apache.myfaces.fusion.conversation.CurrentConversationAdvice;
+import org.apache.myfaces.orchestra.conversation.Conversation;
+import org.apache.myfaces.orchestra.conversation.ConversationAware;
+import org.apache.myfaces.orchestra.conversation.ConversationBindingEvent;
+import org.apache.myfaces.orchestra.conversation.ConversationBindingListener;
+import org.apache.myfaces.orchestra.conversation.ConversationManager;
+import org.apache.myfaces.orchestra.conversation.CurrentConversationAdvice;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -44,7 +44,7 @@
  * &lt;property name="scopes"&gt;
  * &lt;map&gt;
  * &lt;entry key="conversation"&gt;
- * &lt;bean class="org.apache.myfaces.fusion.conversation.spring.SpringConversationScope"&gt;
+ * &lt;bean class="org.apache.myfaces.orchestra.conversation.spring.SpringConversationScope"&gt;
  * &lt;property name="advices"&gt;
  * &lt;list&gt;
  * &lt;ref bean="persistentContextConversationInterceptor" /&gt;
@@ -56,7 +56,7 @@
  * &lt;/property&gt;
  * &lt;/bean&gt;
  * <p/>
- * &lt;bean id="persistentContextConversationInterceptor" class="org.apache.myfaces.fusion.conversation.spring.PersistenceContextConversationInterceptor"&gt;
+ * &lt;bean id="persistentContextConversationInterceptor" class="org.apache.myfaces.orchestra.conversation.spring.PersistenceContextConversationInterceptor"&gt;
  * &lt;property name="persistenceContextFactory" ref="yourPersistentContextFactory" /&gt;
  * &lt;/bean&gt;
  * </pre>

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java Tue Mar 20 14:01:32 2007
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
-import org.apache.myfaces.fusion.conversation.Conversation;
-import org.apache.myfaces.fusion.conversation.FlashManager;
+import org.apache.myfaces.orchestra.conversation.Conversation;
+import org.apache.myfaces.orchestra.conversation.FlashManager;
 
 /**
  * provides a flash scope, that is, a bean will be discarded as soon as it is no longer referenced

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/_SpringUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/_SpringUtils.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/_SpringUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/_SpringUtils.java Tue Mar 20 14:01:32 2007
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.conversation.spring;
+package org.apache.myfaces.orchestra.conversation.spring;
 
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.context.ConfigurableApplicationContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapter.java Tue Mar 20 14:01:32 2007
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.frameworkAdapter;
+package org.apache.myfaces.orchestra.frameworkAdapter;
 
 /**
  * Provides access to the FrameworkAdapter so

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/FrameworkAdapterInterface.java Tue Mar 20 14:01:32 2007
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.frameworkAdapter;
+package org.apache.myfaces.orchestra.frameworkAdapter;
 
 import org.springframework.context.ConfigurableApplicationContext;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/JsfFrameworkAdapter.java Tue Mar 20 14:01:32 2007
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.frameworkAdapter;
+package org.apache.myfaces.orchestra.frameworkAdapter;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/MockFrameworkAdapter.java Tue Mar 20 14:01:32 2007
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.frameworkAdapter;
+package org.apache.myfaces.orchestra.frameworkAdapter;
 
 import org.springframework.context.ConfigurableApplicationContext;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProvider.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProvider.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProvider.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProvider.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.requestParameterProvider;
+package org.apache.myfaces.orchestra.requestParameterProvider;
 
 /**
  * The interface a provider has to implement to add parameters to the url

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java Tue Mar 20 14:01:32 2007
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.requestParameterProvider;
+package org.apache.myfaces.orchestra.requestParameterProvider;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.fusion.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.requestParameterProvider;
+package org.apache.myfaces.orchestra.requestParameterProvider;
 
 
 import javax.servlet.ServletOutputStream;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java Tue Mar 20 14:01:32 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.myfaces.fusion.requestParameterProvider;
+package org.apache.myfaces.orchestra.requestParameterProvider;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/ExternalContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/ExternalContextWrapper.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/ExternalContextWrapper.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/ExternalContextWrapper.java Tue Mar 20 14:01:32 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.urlParamNav;
+package org.apache.myfaces.orchestra.urlParamNav;
 
 import javax.faces.context.ExternalContext;
 import java.io.IOException;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/FacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/FacesContextWrapper.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/FacesContextWrapper.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/FacesContextWrapper.java Tue Mar 20 14:01:32 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.urlParamNav;
+package org.apache.myfaces.orchestra.urlParamNav;
 
 import javax.faces.context.FacesContext;
 import javax.faces.context.ExternalContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterNavigationHandler.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterNavigationHandler.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterNavigationHandler.java Tue Mar 20 14:01:32 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.urlParamNav;
+package org.apache.myfaces.orchestra.urlParamNav;
 
 import javax.faces.application.NavigationHandler;
 import javax.faces.context.ExternalContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterViewHandler.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterViewHandler.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/urlParamNav/UrlParameterViewHandler.java Tue Mar 20 14:01:32 2007
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.fusion.urlParamNav;
+package org.apache.myfaces.orchestra.urlParamNav;
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
@@ -34,7 +34,7 @@
  * This view handler helps to preserve any url parameter you configured in your navigation
  * </p>
  *
- * @see org.apache.myfaces.fusion.urlParamNav.UrlParameterNavigationHandler
+ * @see org.apache.myfaces.orchestra.urlParamNav.UrlParameterNavigationHandler
  */
 public class UrlParameterViewHandler extends ViewHandler
 {

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerExecutor.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerExecutor.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractViewControllerExecutor.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 
 /**

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerManager.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import javax.faces.context.FacesContext;
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerNameMapper.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerNameMapper.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/DefaultViewControllerNameMapper.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import java.util.Arrays;
 import java.util.HashSet;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/InterfaceViewControllerExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/InterfaceViewControllerExecutor.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/InterfaceViewControllerExecutor.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/InterfaceViewControllerExecutor.java Tue Mar 20 14:01:32 2007
@@ -22,7 +22,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 /**
  * Invokes ViewController events using the {@link ViewController} interface

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ReflectiveViewControllerExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ReflectiveViewControllerExecutor.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ReflectiveViewControllerExecutor.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ReflectiveViewControllerExecutor.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import javax.faces.FacesException;
 import java.lang.reflect.InvocationTargetException;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewController.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewController.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewController.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewController.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 /**
  * <p>The ViewController interface</p>

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManager.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import javax.faces.context.FacesContext;
 
@@ -31,12 +31,12 @@
  * {@link #getViewControllerExecutor()} }.<br />
  * To activate your manager just configure it as managed bean in your faces-config.xml or your spring configuration,
  * preferably in application scope or as singleton.<br />
- * The managed-bean-name has to be "<code>fusion_ViewControllerManager</code>" (see constanst {@link ViewControllerManager#VIEW_CONTROLLER_MANAGER_NAME})
+ * The managed-bean-name has to be "<code>orchestra_ViewControllerManager</code>" (see constanst {@link ViewControllerManager#VIEW_CONTROLLER_MANAGER_NAME})
  * </p>
  */
 public interface ViewControllerManager
 {
-	public final static String VIEW_CONTROLLER_MANAGER_NAME = "fusion_ViewControllerManager";
+	public final static String VIEW_CONTROLLER_MANAGER_NAME = "orchestra_ViewControllerManager";
 
 	public ViewControllerNameMapper getViewControllerNameMapper();
 

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerNameMapper.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerNameMapper.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerNameMapper.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 /**
  * <p>The interface for the name mapper.</p>

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerPhaseListener.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerPhaseListener.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerPhaseListener.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;

Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/_ViewControllerUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/_ViewControllerUtils.java?view=diff&rev=520585&r1=520584&r2=520585
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/_ViewControllerUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/_ViewControllerUtils.java Tue Mar 20 14:01:32 2007
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.myfaces.fusion.viewController;
+package org.apache.myfaces.orchestra.viewController;
 
 import javax.faces.context.FacesContext;