[jboss-cvs] jboss-seam/examples/issues/src/org/jboss/seam/example/issues ...
Shane Bryzak
sbryzak at redhat.com
Mon Feb 19 00:41:37 EST 2007
User: sbryzak2
Date: 07/02/19 00:41:37
Modified: examples/issues/src/org/jboss/seam/example/issues
CommentEditorBean.java IssueEditorBean.java
ProjectEditorBean.java
Added: examples/issues/src/org/jboss/seam/example/issues
Authenticator.java
Removed: examples/issues/src/org/jboss/seam/example/issues
CheckLoggedIn.java LoggedIn.java
LoggedInInterceptor.java Login.java LoginBean.java
Log:
use security api
Revision Changes Path
1.7 +9 -9 jboss-seam/examples/issues/src/org/jboss/seam/example/issues/CommentEditorBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CommentEditorBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/issues/src/org/jboss/seam/example/issues/CommentEditorBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CommentEditorBean.java 8 Nov 2006 17:33:00 -0000 1.6
+++ CommentEditorBean.java 19 Feb 2007 05:41:37 -0000 1.7
@@ -18,11 +18,11 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Outcome;
+import org.jboss.seam.annotations.security.Restrict;
@Name("commentEditor")
@Stateful
- at CheckLoggedIn
public class CommentEditorBean implements CommentEditor {
@In(create=true)
@@ -43,19 +43,19 @@
return isNew;
}
- @In(required=false)
- private Login login;
-
@In
private IssueEditor issueEditor;
- @LoggedIn
+ @In(required = false)
+ private User authenticatedUser;
+
@Begin(nested=true)
+ @Restrict("#{identity.loggedIn}")
public String createComment() {
isNew = true;
comment = new Comment();
comment.setIssue( issueEditor.getInstance() );
- comment.setUser( login.getInstance() );
+ comment.setUser( authenticatedUser );
comment.setSubmitted( new Date() );
return "editComment";
}
@@ -68,7 +68,7 @@
}
@End
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@IfInvalid(outcome=Outcome.REDISPLAY)
public String create() {
entityManager.persist(comment);
@@ -80,14 +80,14 @@
}
@End
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@IfInvalid(outcome=Outcome.REDISPLAY, refreshEntities=true)
public String update() {
return "editIssue";
}
@End
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
public String delete() {
entityManager.remove(comment);
comment.getIssue().getComments().remove(comment);
1.12 +10 -13 jboss-seam/examples/issues/src/org/jboss/seam/example/issues/IssueEditorBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IssueEditorBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/issues/src/org/jboss/seam/example/issues/IssueEditorBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- IssueEditorBean.java 9 Feb 2007 16:18:23 -0000 1.11
+++ IssueEditorBean.java 19 Feb 2007 05:41:37 -0000 1.12
@@ -27,13 +27,13 @@
import org.jboss.seam.annotations.Outcome;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.FacesMessages;
@Name("issueEditor")
@Stateful
- at CheckLoggedIn
public class IssueEditorBean implements IssueEditor {
@In(create=true)
@@ -42,23 +42,20 @@
@Valid
private Issue issue;
+ @In(required = false)
+ private User authenticatedUser;
+
@TransactionAttribute(NOT_SUPPORTED)
public Issue getInstance() {
return issue;
}
- @In(required=false)
- private Login login;
-
@Create
public void initialize()
{
issue = new Issue();
issue.setSubmitted( new Date() );
- if ( login!=null )
- {
- issue.setUser( login.getInstance() );
- }
+ issue.setUser( authenticatedUser );
}
private boolean isNew = true;
@@ -73,7 +70,7 @@
@In(required=false)
private transient IssueFinder issueFinder;
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@Begin(join=true)
@IfInvalid(outcome=Outcome.REDISPLAY)
public String create() {
@@ -101,7 +98,7 @@
}
}
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@IfInvalid(outcome=Outcome.REDISPLAY, refreshEntities=true)
public String update()
{
@@ -110,7 +107,7 @@
}
@End
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
public String delete() {
entityManager.remove(issue);
issue.getProject().getIssues().remove(issue);
@@ -152,12 +149,12 @@
return "editIssue";
}
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@Begin(nested=true)
public String createIssue() {
isNew = true;
issue = new Issue();
- issue.setUser( login.getInstance() );
+ issue.setUser( authenticatedUser );
issue.setSubmitted( new Date() );
issue.setProject( projectEditor.getInstance() );
doneOutcome = "editProject";
1.12 +5 -6 jboss-seam/examples/issues/src/org/jboss/seam/example/issues/ProjectEditorBean.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProjectEditorBean.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/issues/src/org/jboss/seam/example/issues/ProjectEditorBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ProjectEditorBean.java 8 Nov 2006 17:33:00 -0000 1.11
+++ ProjectEditorBean.java 19 Feb 2007 05:41:37 -0000 1.12
@@ -23,13 +23,12 @@
import org.jboss.seam.annotations.Outcome;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.FacesMessages;
-
@Name("projectEditor")
@Stateful
- at CheckLoggedIn
public class ProjectEditorBean implements ProjectEditor {
@In(create=true)
@@ -54,7 +53,7 @@
return isNew;
}
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@Begin(join=true)
@IfInvalid(outcome=Outcome.REDISPLAY)
public String create() {
@@ -69,7 +68,7 @@
return "editProject";
}
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@Begin
public String createProject() {
isNew = true;
@@ -83,7 +82,7 @@
"New Project" : "Project [" + project.getName() + "]";
}
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
@IfInvalid(outcome=Outcome.REDISPLAY, refreshEntities=true)
public String update() {
refreshFinder();
@@ -91,7 +90,7 @@
}
@End
- @LoggedIn
+ @Restrict("#{identity.loggedIn}")
public String delete() {
if ( project.getIssues().isEmpty() )
{
1.1 date: 2007/02/19 05:41:37; author: sbryzak2; state: Exp;jboss-seam/examples/issues/src/org/jboss/seam/example/issues/Authenticator.java
Index: Authenticator.java
===================================================================
package org.jboss.seam.example.issues;
import static org.jboss.seam.ScopeType.SESSION;
import java.util.List;
import javax.persistence.EntityManager;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.security.Identity;
@Name("authenticator")
public class Authenticator
{
@In(create=true)
private EntityManager entityManager;
@In
private Identity identity;
@Out(required = false, scope = SESSION)
private User authenticatedUser;
public boolean authenticate()
{
List results = entityManager.createQuery("select u from User u where u.username=:username and u.password=:password")
.setParameter("username", identity.getUsername())
.setParameter("password", identity.getPassword())
.getResultList();
if ( results.size()==0 )
{
return false;
}
else
{
authenticatedUser = (User) results.get(0);
return true;
}
}
}
More information about the jboss-cvs-commits
mailing list