[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Sun Jun 3 13:52:15 EDT 2007
User: gavin
Date: 07/06/03 13:52:15
Modified: src/main/org/jboss/seam/core ConversationList.java
ConversationStack.java FacesPage.java Manager.java
Pages.java ProcessInstance.java Switcher.java
TaskInstance.java
Added: src/main/org/jboss/seam/core Session.java
Log:
JBSEAM-1390
Revision Changes Path
1.12 +6 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationList.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ConversationList.java 21 Dec 2006 02:38:26 -0000 1.11
+++ ConversationList.java 3 Jun 2007 17:52:15 -0000 1.12
@@ -1,22 +1,25 @@
package org.jboss.seam.core;
+
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+
/**
* @author Gavin King
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationList")
@@ -36,7 +39,7 @@
conversationEntryList = new ArrayList<ConversationEntry>( conversationEntries.size() );
for ( ConversationEntry entry: orderedEntries )
{
- if ( entry.isDisplayable() && !Seam.isSessionInvalid() )
+ if ( entry.isDisplayable() && !Session.instance().isInvalid() )
{
conversationEntryList.add(entry);
}
1.10 +4 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationStack.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ConversationStack.java 8 Mar 2007 01:33:03 -0000 1.9
+++ ConversationStack.java 3 Jun 2007 17:52:15 -0000 1.10
@@ -2,12 +2,13 @@
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
+
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
@@ -19,7 +20,7 @@
* Support for "breadcrumbs".
*
* @author Gavin King
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationStack")
@@ -43,7 +44,7 @@
while ( ids.hasPrevious() )
{
ConversationEntry entry = conversationEntries.getConversationEntry( ids.previous() );
- if ( entry.isDisplayable() && !Seam.isSessionInvalid() )
+ if ( entry.isDisplayable() && !Session.instance().isInvalid() )
{
conversationEntryStack.add(entry);
}
1.7 +1 -2 jboss-seam/src/main/org/jboss/seam/core/FacesPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesPage.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesPage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- FacesPage.java 21 Dec 2006 02:38:26 -0000 1.6
+++ FacesPage.java 3 Jun 2007 17:52:15 -0000 1.7
@@ -7,7 +7,6 @@
import org.jboss.seam.Component;
import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
@@ -117,7 +116,7 @@
//we only need to execute this code when we are in the
//RENDER_RESPONSE phase, ie. not before redirects
- boolean sessionValid = !Seam.isSessionInvalid();
+ boolean sessionValid = !Session.instance().isInvalid();
if ( sessionValid && manager.isLongRunningConversation() )
{
storeConversation( manager.getCurrentConversationId() );
1.162 +3 -4 jboss-seam/src/main/org/jboss/seam/core/Manager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Manager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- Manager.java 27 Mar 2007 02:24:19 -0000 1.161
+++ Manager.java 3 Jun 2007 17:52:15 -0000 1.162
@@ -26,7 +26,6 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
@@ -45,7 +44,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.161 $
+ * @version $Revision: 1.162 $
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@@ -246,7 +245,7 @@
{
return isLongRunningConversation() &&
!getCurrentConversationEntry().isRemoveAfterRedirect() &&
- !Seam.isSessionInvalid();
+ !Session.instance().isInvalid();
}
public boolean isNestedConversation()
@@ -893,7 +892,7 @@
private String encodeConversationIdParameter(String url, String paramName, String paramValue)
{
- if ( Seam.isSessionInvalid() || containsParameter(url, paramName) )
+ if ( Session.instance().isInvalid() || containsParameter(url, paramName) )
{
return url;
}
1.123 +1 -2 jboss-seam/src/main/org/jboss/seam/core/Pages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Pages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- Pages.java 3 Jun 2007 02:07:48 -0000 1.122
+++ Pages.java 3 Jun 2007 17:52:15 -0000 1.123
@@ -29,7 +29,6 @@
import org.dom4j.Element;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
@@ -270,7 +269,7 @@
Manager.instance().redirect(viewId);
if (invalidateSessionBeforeSchemeChange)
{
- Seam.invalidateSession();
+ Session.instance().invalidate();
}
return false;
}
1.21 +3 -7 jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProcessInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ProcessInstance.java 26 Jan 2007 23:16:38 -0000 1.20
+++ ProcessInstance.java 3 Jun 2007 17:52:15 -0000 1.21
@@ -24,9 +24,9 @@
* jBPM ProcessInstance.
*
* @author Gavin King
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
- at Scope(ScopeType.APPLICATION)
+ at Scope(ScopeType.STATELESS)
@Name("org.jboss.seam.core.processInstance")
@Intercept(InterceptionType.NEVER)
@Install(precedence=BUILT_IN, dependencies="org.jboss.seam.core.jbpm")
@@ -64,10 +64,6 @@
{
if ( !Contexts.isConversationContextActive() || !BusinessProcess.instance().hasCurrentProcess() ) return null; //so we don't start a txn
- if ( !Contexts.isApplicationContextActive() )
- {
- throw new IllegalStateException("No active application context");
- }
- return (org.jbpm.graph.exe.ProcessInstance) Component.getInstance(ProcessInstance.class, ScopeType.APPLICATION);
+ return (org.jbpm.graph.exe.ProcessInstance) Component.getInstance(ProcessInstance.class, ScopeType.STATELESS);
}
}
1.18 +2 -3 jboss-seam/src/main/org/jboss/seam/core/Switcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Switcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Switcher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Switcher.java 21 Dec 2006 02:38:26 -0000 1.17
+++ Switcher.java 3 Jun 2007 17:52:15 -0000 1.18
@@ -13,7 +13,6 @@
import javax.faces.model.SelectItem;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
@@ -25,7 +24,7 @@
* Support for the conversation switcher drop-down menu.
*
* @author Gavin King
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.switcher")
@@ -46,7 +45,7 @@
selectItems = new ArrayList<SelectItem>( conversationEntries.size() );
for ( ConversationEntry entry: orderedEntries )
{
- if ( entry.isDisplayable() && !Seam.isSessionInvalid() )
+ if ( entry.isDisplayable() && !Session.instance().isInvalid() )
{
selectItems.add( new SelectItem( entry.getId(), entry.getDescription() ) );
}
1.20 +3 -7 jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- TaskInstance.java 26 Jan 2007 23:16:38 -0000 1.19
+++ TaskInstance.java 3 Jun 2007 17:52:15 -0000 1.20
@@ -24,9 +24,9 @@
* jBPM TaskInstance.
*
* @author Gavin King
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
- at Scope(ScopeType.APPLICATION)
+ at Scope(ScopeType.STATELESS)
@Name("org.jboss.seam.core.taskInstance")
@Intercept(InterceptionType.NEVER)
@Install(precedence=BUILT_IN, dependencies="org.jboss.seam.core.jbpm")
@@ -63,11 +63,7 @@
{
if ( !Contexts.isConversationContextActive() || !BusinessProcess.instance().hasCurrentTask() ) return null; //so we don't start a txn
- if ( !Contexts.isApplicationContextActive() )
- {
- throw new IllegalStateException("No active application context");
- }
- return (org.jbpm.taskmgmt.exe.TaskInstance) Component.getInstance(TaskInstance.class, ScopeType.APPLICATION);
+ return (org.jbpm.taskmgmt.exe.TaskInstance) Component.getInstance(TaskInstance.class, ScopeType.STATELESS);
}
}
1.1 date: 2007/06/03 17:52:15; author: gavin; state: Exp;jboss-seam/src/main/org/jboss/seam/core/Session.java
Index: Session.java
===================================================================
package org.jboss.seam.core;
import org.jboss.seam.Component;
import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.session")
@Intercept(InterceptionType.NEVER)
public class Session
{
private boolean isInvalid;
public boolean isInvalid()
{
return isInvalid;
}
public void invalidate()
{
this.isInvalid = true;
}
public static Session instance()
{
if ( !Contexts.isEventContextActive() )
{
throw new IllegalStateException("No active event context");
}
return (Session) Component.getInstance(Conversation.class, ScopeType.EVENT);
}
}
More information about the jboss-cvs-commits
mailing list