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/08/30 14:40:48 UTC
svn commit: r571139 - in /myfaces/orchestra/trunk/core/src/main:
java/org/apache/myfaces/orchestra/conversation/
java/org/apache/myfaces/orchestra/lib/jsf/ resources/META-INF/
Author: imario
Date: Thu Aug 30 05:40:47 2007
New Revision: 571139
URL: http://svn.apache.org/viewvc?rev=571139&view=rev
Log:
changed jdk1.5 code, moved OrchestraInitializationPhaseListener (which has been split out of the ConversationPhaseListener)
Added:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java (contents, props changed)
- copied, changed from r571134, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java?rev=571139&r1=571138&r2=571139&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java Thu Aug 30 05:40:47 2007
@@ -156,7 +156,10 @@
aspect = (ConversationAspect) aspectClass.getConstructor(new Class[]
{
Conversation.class
- }).newInstance(conversation);
+ }).newInstance(new Object[]
+ {
+ conversation
+ });
}
catch (InstantiationException e)
{
Copied: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java (from r571134, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java?p2=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java&p1=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java&r1=571134&r2=571139&rev=571139&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java Thu Aug 30 05:40:47 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.orchestra.conversation.jsf;
+package org.apache.myfaces.orchestra.lib.jsf;
import org.apache.myfaces.orchestra.conversation.ConversationManager;
@@ -32,11 +32,11 @@
* At start of request processing, if this is a new http session then initialise Orchestra
* for this session.
*/
-public class ConversationPhaseListener implements PhaseListener
+public class OrchestraInitializationPhaseListener implements PhaseListener
{
private static final long serialVersionUID = 1L;
- private final static String SYSTEM_INITIALIZED = ConversationPhaseListener.class.getName() + ".INITIALIZED";
+ private final static String SYSTEM_INITIALIZED = OrchestraInitializationPhaseListener.class.getName() + ".INITIALIZED";
public void afterPhase(PhaseEvent event)
{
Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/OrchestraInitializationPhaseListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml?rev=571139&r1=571138&r2=571139&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/orchestra/trunk/core/src/main/resources/META-INF/faces-config.xml Thu Aug 30 05:40:47 2007
@@ -35,7 +35,7 @@
</component>
<lifecycle>
- <phase-listener>org.apache.myfaces.orchestra.conversation.jsf.ConversationPhaseListener</phase-listener>
+ <phase-listener>org.apache.myfaces.orchestra.lib.jsf.OrchestraInitializationPhaseListener</phase-listener>
<phase-listener>org.apache.myfaces.orchestra.conversation.jsf.FlashScopePhaseListener</phase-listener>
<phase-listener>org.apache.myfaces.orchestra.viewController.jsf.ViewControllerPhaseListener</phase-listener>
</lifecycle>