[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Sun Jun 3 19:02:25 EDT 2007
User: gavin
Date: 07/06/03 19:02:25
Modified: src/main/org/jboss/seam/core ConversationList.java
ConversationStack.java FacesPage.java Manager.java
Pages.java Switcher.java
Added: src/main/org/jboss/seam/core ServletSession.java
Removed: src/main/org/jboss/seam/core Session.java
Log:
rename
Revision Changes Path
1.13 +2 -2 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ConversationList.java 3 Jun 2007 17:52:15 -0000 1.12
+++ ConversationList.java 3 Jun 2007 23:02:25 -0000 1.13
@@ -19,7 +19,7 @@
/**
* @author Gavin King
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationList")
@@ -39,7 +39,7 @@
conversationEntryList = new ArrayList<ConversationEntry>( conversationEntries.size() );
for ( ConversationEntry entry: orderedEntries )
{
- if ( entry.isDisplayable() && !Session.instance().isInvalid() )
+ if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() )
{
conversationEntryList.add(entry);
}
1.11 +2 -2 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ConversationStack.java 3 Jun 2007 17:52:15 -0000 1.10
+++ ConversationStack.java 3 Jun 2007 23:02:25 -0000 1.11
@@ -20,7 +20,7 @@
* Support for "breadcrumbs".
*
* @author Gavin King
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationStack")
@@ -44,7 +44,7 @@
while ( ids.hasPrevious() )
{
ConversationEntry entry = conversationEntries.getConversationEntry( ids.previous() );
- if ( entry.isDisplayable() && !Session.instance().isInvalid() )
+ if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() )
{
conversationEntryStack.add(entry);
}
1.8 +1 -1 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- FacesPage.java 3 Jun 2007 17:52:15 -0000 1.7
+++ FacesPage.java 3 Jun 2007 23:02:25 -0000 1.8
@@ -116,7 +116,7 @@
//we only need to execute this code when we are in the
//RENDER_RESPONSE phase, ie. not before redirects
- boolean sessionValid = !Session.instance().isInvalid();
+ boolean sessionValid = !ServletSession.instance().isInvalid();
if ( sessionValid && manager.isLongRunningConversation() )
{
storeConversation( manager.getCurrentConversationId() );
1.165 +3 -3 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.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- Manager.java 3 Jun 2007 20:54:23 -0000 1.164
+++ Manager.java 3 Jun 2007 23:02:25 -0000 1.165
@@ -44,7 +44,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.164 $
+ * @version $Revision: 1.165 $
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@@ -244,7 +244,7 @@
{
return isLongRunningConversation() &&
!getCurrentConversationEntry().isRemoveAfterRedirect() &&
- !Session.instance().isInvalid();
+ !ServletSession.instance().isInvalid();
}
public boolean isNestedConversation()
@@ -886,7 +886,7 @@
private String encodeConversationIdParameter(String url, String paramName, String paramValue)
{
- if ( Session.instance().isInvalid() || containsParameter(url, paramName) )
+ if ( ServletSession.instance().isInvalid() || containsParameter(url, paramName) )
{
return url;
}
1.126 +1 -1 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.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- Pages.java 3 Jun 2007 19:38:29 -0000 1.125
+++ Pages.java 3 Jun 2007 23:02:25 -0000 1.126
@@ -269,7 +269,7 @@
Manager.instance().redirect(viewId);
if (invalidateSessionBeforeSchemeChange)
{
- Session.instance().invalidate();
+ ServletSession.instance().invalidate();
}
return false;
}
1.19 +2 -2 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Switcher.java 3 Jun 2007 17:52:15 -0000 1.18
+++ Switcher.java 3 Jun 2007 23:02:25 -0000 1.19
@@ -24,7 +24,7 @@
* Support for the conversation switcher drop-down menu.
*
* @author Gavin King
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.switcher")
@@ -45,7 +45,7 @@
selectItems = new ArrayList<SelectItem>( conversationEntries.size() );
for ( ConversationEntry entry: orderedEntries )
{
- if ( entry.isDisplayable() && !Session.instance().isInvalid() )
+ if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() )
{
selectItems.add( new SelectItem( entry.getId(), entry.getDescription() ) );
}
1.1 date: 2007/06/03 23:02:25; author: gavin; state: Exp;jboss-seam/src/main/org/jboss/seam/core/ServletSession.java
Index: ServletSession.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.servletSession")
@Intercept(InterceptionType.NEVER)
public class ServletSession
{
private boolean isInvalid;
public boolean isInvalid()
{
return isInvalid;
}
public void invalidate()
{
this.isInvalid = true;
}
public static ServletSession instance()
{
if ( !Contexts.isEventContextActive() )
{
throw new IllegalStateException("No active event context");
}
return (ServletSession) Component.getInstance(ServletSession.class, ScopeType.EVENT);
}
}
More information about the jboss-cvs-commits
mailing list