[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Gavin King
gavin.king at jboss.com
Tue Jun 26 18:47:52 EDT 2007
User: gavin
Date: 07/06/26 18:47:52
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
AdminHome.java Authenticator.java NodeBrowser.java
UserHome.java
Log:
fix against current
Revision Changes Path
1.6 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AdminHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AdminHome.java 20 Jun 2007 01:30:36 -0000 1.5
+++ AdminHome.java 26 Jun 2007 22:47:52 -0000 1.6
@@ -10,6 +10,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.remoting.WebRemote;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
import org.jboss.seam.annotations.security.Restrict;
@@ -118,7 +119,7 @@
entityManager.joinTransaction();
// TODO: http://jira.jboss.com/jira/browse/JBSEAM-1297
- ClassValidator<LinkProtocol> validator = Validators.instance().getValidator(LinkProtocol.class, null);
+ ClassValidator<LinkProtocol> validator = Validators.instance().getValidator(LinkProtocol.class);
InvalidValue[] ivs = validator.getInvalidValues(linkProtocol);
if (ivs.length>0) {
for (InvalidValue iv : ivs) {
1.6 +1 -0 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Authenticator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Authenticator.java 8 Apr 2007 15:10:32 -0000 1.5
+++ Authenticator.java 26 Jun 2007 22:47:52 -0000 1.6
@@ -1,6 +1,7 @@
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.wiki.core.dao.UserDAO;
import org.jboss.seam.wiki.core.dao.NodeDAO;
import org.jboss.seam.wiki.core.dao.UserRoleAccessFactory;
1.17 +2 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeBrowser.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeBrowser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NodeBrowser.java 21 Jun 2007 11:05:49 -0000 1.16
+++ NodeBrowser.java 26 Jun 2007 22:47:52 -0000 1.17
@@ -1,6 +1,7 @@
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Component;
import org.jboss.seam.faces.FacesMessages;
@@ -145,7 +146,7 @@
FacesManager.instance().switchConversation(entryPoint.getId());
log.debug("propagating faces messages from the ended conversation into the destination conversation");
- Contexts.getConversationContext().set("org.jboss.seam.core.facesMessages", messages);
+ Contexts.getConversationContext().set("org.jboss.seam.faces.facesMessages", messages);
} else {
log.debug("the entry-point of this conversation is gone, redirecting to wiki start page");
FacesManager.instance().redirect("/display.xhtml", new HashMap<String,Object>(), true);
1.12 +1 -0 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- UserHome.java 25 Jun 2007 23:03:37 -0000 1.11
+++ UserHome.java 26 Jun 2007 22:47:52 -0000 1.12
@@ -3,6 +3,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
More information about the jboss-cvs-commits
mailing list