[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...
Gavin King
gavin.king at jboss.com
Tue Jun 19 15:02:35 EDT 2007
User: gavin
Date: 07/06/19 15:02:35
Modified: src/main/org/jboss/seam/jsf
SeamApplicationMessageBundle.java
SeamNavigationHandler.java SeamPhaseListener.java
SeamStateManager.java SeamViewHandler.java
Log:
repackaged built-in components
sorry for breakage, but it had to happen eventually :-(
Revision Changes Path
1.3 +2 -2 jboss-seam/src/main/org/jboss/seam/jsf/SeamApplicationMessageBundle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamApplicationMessageBundle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamApplicationMessageBundle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SeamApplicationMessageBundle.java 8 Jun 2007 16:57:07 -0000 1.2
+++ SeamApplicationMessageBundle.java 19 Jun 2007 19:02:35 -0000 1.3
@@ -19,13 +19,13 @@
@Override
public Enumeration<String> getKeys()
{
- return org.jboss.seam.core.ResourceBundle.instance().getKeys();
+ return org.jboss.seam.international.ResourceBundle.instance().getKeys();
}
@Override
protected Object handleGetObject(String key)
{
- Object resource = org.jboss.seam.core.ResourceBundle.instance().getObject(key);
+ Object resource = org.jboss.seam.international.ResourceBundle.instance().getObject(key);
return resource!=null && ( resource instanceof String ) ?
Interpolator.instance().interpolate( (String) resource ) :
resource;
1.18 +4 -4 jboss-seam/src/main/org/jboss/seam/jsf/SeamNavigationHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamNavigationHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamNavigationHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- SeamNavigationHandler.java 17 Dec 2006 00:25:14 -0000 1.17
+++ SeamNavigationHandler.java 19 Jun 2007 19:02:35 -0000 1.18
@@ -4,9 +4,9 @@
import javax.faces.context.FacesContext;
import org.jboss.seam.core.Init;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.Pageflow;
-import org.jboss.seam.core.Pages;
+import org.jboss.seam.faces.JsfManager;
+import org.jboss.seam.navigation.Pageflow;
+import org.jboss.seam.navigation.Pages;
public class SeamNavigationHandler extends NavigationHandler {
@@ -23,7 +23,7 @@
{
if ( isOutcomeViewId(outcome) )
{
- Manager.instance().interpolateAndRedirect(outcome);
+ JsfManager.instance().interpolateAndRedirect(outcome);
}
else if ( Init.instance().isJbpmInstalled() && Pageflow.instance().isInProcess() && Pageflow.instance().hasTransition(outcome) )
{
1.103 +11 -10 jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- SeamPhaseListener.java 18 Jun 2007 17:27:23 -0000 1.102
+++ SeamPhaseListener.java 19 Jun 2007 19:02:35 -0000 1.103
@@ -30,18 +30,19 @@
import org.jboss.seam.core.ConversationPropagation;
import org.jboss.seam.core.ConversationStack;
import org.jboss.seam.core.Events;
-import org.jboss.seam.core.Exceptions;
-import org.jboss.seam.core.FacesMessages;
-import org.jboss.seam.core.FacesPage;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.Pageflow;
-import org.jboss.seam.core.Pages;
-import org.jboss.seam.core.PersistenceContexts;
-import org.jboss.seam.core.Switcher;
-import org.jboss.seam.core.Validation;
+import org.jboss.seam.exceptions.Exceptions;
+import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.faces.FacesPage;
+import org.jboss.seam.faces.JsfManager;
+import org.jboss.seam.faces.Switcher;
+import org.jboss.seam.faces.Validation;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
+import org.jboss.seam.navigation.Pageflow;
+import org.jboss.seam.navigation.Pages;
+import org.jboss.seam.persistence.PersistenceContexts;
import org.jboss.seam.transaction.Transaction;
import org.jboss.seam.util.Reflections;
@@ -483,7 +484,7 @@
FacesMessages.instance().beforeRenderResponse();
//do this both before and after render, since conversations
//and pageflows can begin during render
- Manager.instance().prepareBackswitch(facesContext);
+ JsfManager.instance().prepareBackswitch(facesContext);
}
FacesPage.instance().storeConversation();
@@ -500,7 +501,7 @@
{
//do this both before and after render, since conversations
//and pageflows can begin during render
- Manager.instance().prepareBackswitch(facesContext);
+ JsfManager.instance().prepareBackswitch(facesContext);
PersistenceContexts persistenceContexts = PersistenceContexts.instance();
if (persistenceContexts != null)
1.10 +1 -1 jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamStateManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SeamStateManager.java 13 May 2007 08:33:34 -0000 1.9
+++ SeamStateManager.java 19 Jun 2007 19:02:35 -0000 1.10
@@ -7,7 +7,7 @@
import javax.faces.context.FacesContext;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.Pages;
+import org.jboss.seam.navigation.Pages;
/**
* A wrapper for the JSF implementation's StateManager that allows
1.4 +1 -1 jboss-seam/src/main/org/jboss/seam/jsf/SeamViewHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamViewHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamViewHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SeamViewHandler.java 16 May 2007 15:48:11 -0000 1.3
+++ SeamViewHandler.java 19 Jun 2007 19:02:35 -0000 1.4
@@ -9,7 +9,7 @@
import javax.faces.context.FacesContext;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.LocaleSelector;
+import org.jboss.seam.international.LocaleSelector;
public class SeamViewHandler extends ViewHandler
{
More information about the jboss-cvs-commits
mailing list