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/05/11 11:55:18 UTC
svn commit: r537153 - in /myfaces/current/orchestra/core/src/main:
java/org/apache/myfaces/orchestra/conversation/jsf/components/
resources/META-INF/
Author: imario
Date: Fri May 11 02:55:17 2007
New Revision: 537153
URL: http://svn.apache.org/viewvc?view=rev&rev=537153
Log:
changed component-type to avoid conflict with myfaces-tomahawk-sandbox stuff
Modified:
myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
myfaces/current/orchestra/core/src/main/resources/META-INF/faces-config.xml
Modified: myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
URL: http://svn.apache.org/viewvc/myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java?view=diff&rev=537153&r1=537152&r2=537153
==============================================================================
--- myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java (original)
+++ myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java Fri May 11 02:55:17 2007
@@ -63,7 +63,7 @@
*/
public class UIEndConversation extends AbstractConversationComponent
{
- public static final String COMPONENT_TYPE = "org.apache.myfaces.EndConversation";
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.orchestra.EndConversation";
private String onOutcome;
private String errorOutcome;
Modified: myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java?view=diff&rev=537153&r1=537152&r2=537153
==============================================================================
--- myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java (original)
+++ myfaces/current/orchestra/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java Fri May 11 02:55:17 2007
@@ -35,7 +35,7 @@
public class UISeparateConversationContext extends UIComponentBase
{
public static final String COMPONENT_FAMILY = "javax.faces.Component";
- public static final String COMPONENT_TYPE = "org.apache.myfaces.SeparateConversationContext";
+ public static final String COMPONENT_TYPE = "org.apache.myfaces.orchestra.SeparateConversationContext";
private final static ThreadLocal inSeperationMode = new ThreadLocal();
Modified: myfaces/current/orchestra/core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/current/orchestra/core/src/main/resources/META-INF/faces-config.xml?view=diff&rev=537153&r1=537152&r2=537153
==============================================================================
--- myfaces/current/orchestra/core/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/current/orchestra/core/src/main/resources/META-INF/faces-config.xml Fri May 11 02:55:17 2007
@@ -26,13 +26,12 @@
<faces-config>
<component>
- <component-type>org.apache.myfaces.EndConversation</component-type>
+ <component-type>org.apache.myfaces.orchestra.EndConversation</component-type>
<component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UIEndConversation</component-class>
</component>
<component>
- <component-type>org.apache.myfaces.SeparateConversationContext</component-type>
- <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext
- </component-class>
+ <component-type>org.apache.myfaces.orchestra.SeparateConversationContext</component-type>
+ <component-class>org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext</component-class>
</component>
<lifecycle>