[jboss-cvs] jboss-seam/src/main/org/jboss/seam/contexts ...
Gavin King
gavin.king at jboss.com
Tue Jun 19 15:02:31 EDT 2007
User: gavin
Date: 07/06/19 15:02:31
Modified: src/main/org/jboss/seam/contexts
BusinessProcessContext.java
ContextualHttpServletRequest.java Lifecycle.java
PageContext.java PassivatedEntity.java
Log:
repackaged built-in components
sorry for breakage, but it had to happen eventually :-(
Revision Changes Path
1.38 +2 -2 jboss-seam/src/main/org/jboss/seam/contexts/BusinessProcessContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcessContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/BusinessProcessContext.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- BusinessProcessContext.java 10 Jun 2007 20:44:19 -0000 1.37
+++ BusinessProcessContext.java 19 Jun 2007 19:02:31 -0000 1.38
@@ -13,10 +13,10 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.bpm.ProcessInstance;
+import org.jboss.seam.bpm.TaskInstance;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Init;
-import org.jboss.seam.core.ProcessInstance;
-import org.jboss.seam.core.TaskInstance;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jbpm.context.exe.ContextInstance;
1.2 +1 -4 jboss-seam/src/main/org/jboss/seam/contexts/ContextualHttpServletRequest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContextualHttpServletRequest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ContextualHttpServletRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContextualHttpServletRequest.java 13 Jun 2007 21:07:33 -0000 1.1
+++ ContextualHttpServletRequest.java 19 Jun 2007 19:02:31 -0000 1.2
@@ -2,17 +2,16 @@
import java.io.IOException;
-import javax.faces.event.PhaseId;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.core.ConversationPropagation;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.ServletContexts;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.servlet.ServletRequestSessionMap;
+import org.jboss.seam.web.ServletContexts;
public abstract class ContextualHttpServletRequest
{
@@ -32,7 +31,6 @@
public void run() throws ServletException, IOException
{
log.debug("beginning request");
- Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
Lifecycle.beginRequest(servletContext, request);
ServletContexts.instance().setRequest(request);
restoreConversationId();
@@ -66,7 +64,6 @@
}
finally
{
- Lifecycle.setPhaseId(null);
log.debug("ended request");
}
}
1.100 +9 -8 jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Lifecycle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- Lifecycle.java 18 Jun 2007 01:35:38 -0000 1.99
+++ Lifecycle.java 19 Jun 2007 19:02:31 -0000 1.100
@@ -1,8 +1,8 @@
/*
- * JBoss, Home of Professional Open Source �
+ * JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
- * See terms of license at gnu.org. �
+ * See terms of license at gnu.org.
*/
package org.jboss.seam.contexts;
@@ -10,13 +10,13 @@
import java.util.Set;
import javax.faces.context.ExternalContext;
-import javax.faces.event.PhaseId;
+import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.core.BusinessProcess;
+import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Init;
@@ -25,6 +25,7 @@
import org.jboss.seam.core.ServletSession;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
+import org.jboss.seam.navigation.Pages;
import org.jboss.seam.servlet.ServletApplicationMap;
import org.jboss.seam.servlet.ServletRequestMap;
import org.jboss.seam.servlet.ServletRequestSessionMap;
@@ -46,7 +47,7 @@
Contexts.applicationContext.set( new ApplicationContext( externalContext.getApplicationMap() ) );
Contexts.sessionContext.set( new SessionContext( externalContext.getSessionMap() ) );
ServletSession servletSession = ServletSession.getInstance();
- if ( servletSession!=null && servletSession.isInvalidDueToNewScheme() )
+ if ( servletSession!=null && servletSession.isInvalidDueToNewScheme( Pages.getRequestScheme( FacesContext.getCurrentInstance() ) ) )
{
invalidateSession(externalContext);
}
@@ -525,14 +526,14 @@
Contexts.businessProcessContext.set( new BusinessProcessContext() );
}
- private static ThreadLocal<PhaseId> phaseId = new ThreadLocal<PhaseId>();
+ private static ThreadLocal phaseId = new ThreadLocal();
- public static PhaseId getPhaseId()
+ public static Object getPhaseId()
{
return phaseId.get();
}
- public static void setPhaseId(PhaseId phase)
+ public static void setPhaseId(Object phase)
{
phaseId.set(phase);
}
1.16 +2 -2 jboss-seam/src/main/org/jboss/seam/contexts/PageContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PageContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PageContext.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- PageContext.java 19 Jun 2007 06:36:53 -0000 1.15
+++ PageContext.java 19 Jun 2007 19:02:31 -0000 1.16
@@ -148,12 +148,12 @@
private static PhaseId getPhaseId()
{
- PhaseId phaseId = Lifecycle.getPhaseId();
+ Object phaseId = Lifecycle.getPhaseId();
if (phaseId==null)
{
throw new IllegalStateException("No phase id bound to current thread (make sure you do not have two SeamPhaseListener instances installed)");
}
- return phaseId;
+ return (PhaseId) phaseId;
}
private static boolean isBeforeInvokeApplicationPhase()
1.14 +1 -1 jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PassivatedEntity.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PassivatedEntity.java 18 Jun 2007 20:38:22 -0000 1.13
+++ PassivatedEntity.java 19 Jun 2007 19:02:31 -0000 1.14
@@ -7,8 +7,8 @@
import org.hibernate.Session;
import org.jboss.seam.Component;
import org.jboss.seam.Seam;
-import org.jboss.seam.core.PersistenceContexts;
import org.jboss.seam.persistence.HibernatePersistenceProvider;
+import org.jboss.seam.persistence.PersistenceContexts;
import org.jboss.seam.persistence.PersistenceProvider;
import org.jboss.seam.transaction.Transaction;
More information about the jboss-cvs-commits
mailing list