[seam-commits] Seam SVN: r12265 - in modules/security/trunk/examples/seamspace: src/main/java/org/jboss/seam/security/examples/seamspace and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Mar 24 23:15:33 EDT 2010
Author: shane.bryzak at jboss.com
Date: 2010-03-24 23:15:31 -0400 (Wed, 24 Mar 2010)
New Revision: 12265
Modified:
modules/security/trunk/examples/seamspace/pom.xml
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AccountPermission.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AuthenticationEvents.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogComment.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentServlet.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendComment.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Hash.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/HashGenerator.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ImagePermission.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Member.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberAccount.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberBlog.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberFriend.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberImage.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberRole.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureSearch.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ProfileAction.java
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/RegisterAction.java
Log:
fix imports, dependencies
Modified: modules/security/trunk/examples/seamspace/pom.xml
===================================================================
--- modules/security/trunk/examples/seamspace/pom.xml 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/pom.xml 2010-03-25 03:15:31 UTC (rev 12265)
@@ -48,6 +48,16 @@
<version>1.1</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AccountPermission.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AccountPermission.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AccountPermission.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
@@ -6,11 +6,11 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import org.jboss.seam.annotations.security.permission.PermissionAction;
-import org.jboss.seam.annotations.security.permission.PermissionDiscriminator;
-import org.jboss.seam.annotations.security.permission.PermissionRole;
-import org.jboss.seam.annotations.security.permission.PermissionTarget;
-import org.jboss.seam.annotations.security.permission.PermissionUser;
+import org.jboss.seam.security.annotations.permission.PermissionAction;
+import org.jboss.seam.security.annotations.permission.PermissionDiscriminator;
+import org.jboss.seam.security.annotations.permission.PermissionRole;
+import org.jboss.seam.security.annotations.permission.PermissionTarget;
+import org.jboss.seam.security.annotations.permission.PermissionUser;
@Entity
public class AccountPermission implements Serializable
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AuthenticationEvents.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AuthenticationEvents.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/AuthenticationEvents.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,16 +1,15 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Observer;
-import org.jboss.seam.contexts.Contexts;
+import javax.inject.Named;
+
import org.jboss.seam.security.management.JpaIdentityStore;
- at Name("authenticationEvents")
+ at Named
public class AuthenticationEvents
{
- @Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED)
+ //@Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED)
public void loginSuccessful(MemberAccount account)
{
- Contexts.getSessionContext().set("authenticatedMember", account.getMember());
+ // Contexts.getSessionContext().set("authenticatedMember", account.getMember());
}
}
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,47 +1,40 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
-
import java.util.ArrayList;
import java.util.Date;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.End;
-import org.jboss.seam.annotations.Factory;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
-import org.jboss.seam.annotations.Scope;
-
- at Scope(CONVERSATION)
- at Name("blog")
+ at Named("blog")
+ at ConversationScoped
public class BlogAction
{
private String name;
private Integer blogId;
- @In
- private EntityManager entityManager;
+ @Inject EntityManager entityManager;
- @In(required = false) @Out(required = false)
- private MemberBlog selectedBlog;
+ @Inject MemberBlog selectedBlog;
- @In(required = false)
- private Member authenticatedMember;
+ @Inject Member authenticatedMember;
+ @Inject Conversation conversation;
+
/**
* Used to read a single blog entry for a member
- */
- @Factory("selectedBlog")
- @Begin(join=true)
- public void getBlog()
+ */
+ public @Produces @Named("selectedBlog") MemberBlog getBlog()
{
+ conversation.begin();
try
{
- selectedBlog = (MemberBlog) entityManager.createQuery(
+ return (MemberBlog) entityManager.createQuery(
"from MemberBlog b where b.blogId = :blogId and b.member.memberName = :memberName")
.setParameter("blogId", blogId)
.setParameter("memberName", name)
@@ -56,7 +49,6 @@
selectedBlog = new MemberBlog();
}
- @End
public void saveEntry()
{
selectedBlog.setMember(authenticatedMember);
@@ -64,6 +56,8 @@
selectedBlog.setComments(new ArrayList<BlogComment>());
entityManager.persist(selectedBlog);
+
+ conversation.end();
}
public String getName()
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogComment.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogComment.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/BlogComment.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -11,11 +11,8 @@
import javax.persistence.ManyToOne;
import javax.persistence.Transient;
-import org.hibernate.validator.NotNull;
-import org.jboss.seam.annotations.Name;
@Entity
- at Name("blogComment")
public class BlogComment implements Serializable
{
private static final long serialVersionUID = 5495139096911872039L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,25 +1,22 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.STATELESS;
-
+import javax.inject.Inject;
+import javax.inject.Named;
import javax.persistence.EntityManager;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
import org.jboss.seam.security.Identity;
- at Scope(STATELESS)
- at Name("contentAction")
+ at Named
public class ContentAction
{
- @In EntityManager entityManager;
+ @Inject EntityManager entityManager;
+ @Inject Identity identity;
public MemberImage getImage(int imageId)
{
MemberImage img = entityManager.find(MemberImage.class, imageId);
- if (img == null || !Identity.instance().hasPermission(img, "view"))
+ if (img == null || !identity.hasPermission(img, "view"))
return null;
else
return img;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentServlet.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentServlet.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ContentServlet.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -14,7 +14,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.swing.ImageIcon;
-import org.jboss.seam.Component;
/**
* Serves images and other member content
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,29 +1,18 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
-
import java.io.Serializable;
import java.util.Date;
import javax.ejb.Remove;
+import javax.enterprise.context.ConversationScoped;
+import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.End;
-import org.jboss.seam.annotations.Factory;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.web.RequestParameter;
-import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Identity;
- at Scope(CONVERSATION)
- at Name("friendAction")
+ at Named
+ at ConversationScoped
public class FriendAction implements Serializable
{
private static final long serialVersionUID = 4565339001481077911L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendComment.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendComment.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/FriendComment.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -11,10 +11,7 @@
import javax.persistence.ManyToOne;
import javax.persistence.Transient;
-import org.jboss.seam.annotations.Name;
-
@Entity
- at Name("friendComment")
public class FriendComment implements Serializable
{
private static final long serialVersionUID = -288494386341008371L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Hash.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Hash.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Hash.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,12 +1,9 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.security.MessageDigest;
-import org.jboss.seam.Component;
-import org.jboss.seam.annotations.Name;
import org.jboss.seam.util.Hex;
- at Name("hash")
public class Hash {
String hashFunction = "MD5";
String charset = "UTF-8";
@@ -38,8 +35,4 @@
public void setHashFunction(String hashFunction) {
this.hashFunction = hashFunction;
}
-
- public static Hash instance() {
- return (Hash) Component.getInstance(Hash.class);
- }
}
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/HashGenerator.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/HashGenerator.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/HashGenerator.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,18 +1,17 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
+import javax.enterprise.inject.Model;
+import javax.inject.Inject;
+
import org.jboss.seam.security.crypto.BinTools;
import org.jboss.seam.security.management.JpaIdentityStore;
import org.jboss.seam.security.management.PasswordHash;
- at Scope(ScopeType.EVENT)
- at Name("hashgenerator")
+ at Model
public class HashGenerator
{
- @In JpaIdentityStore identityStore;
+ @Inject JpaIdentityStore identityStore;
+ @Inject PasswordHash hash;
private String password;
private String passwordHash;
@@ -54,7 +53,7 @@
if (passwordSalt == null || "".equals(passwordSalt.trim()))
{
- salt = PasswordHash.instance().generateRandomSalt();
+ salt = hash.generateRandomSalt();
passwordSalt = BinTools.bin2hex(salt);
}
else
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ImagePermission.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ImagePermission.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ImagePermission.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,20 +1,13 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
-
import java.io.Serializable;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
+import javax.enterprise.inject.Model;
import javax.persistence.EntityManager;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.Conversation;
-import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Role;
import org.jboss.seam.security.SimplePrincipal;
import org.jboss.seam.security.management.IdentityManager;
@@ -22,8 +15,7 @@
import org.jboss.seam.security.permission.PermissionManager;
import org.jboss.seam.security.permission.action.PermissionSearch;
- at Name("imagePermission")
- at Scope(CONVERSATION)
+ at Model
public class ImagePermission implements Serializable
{
private static final long serialVersionUID = -4943654157860780587L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Member.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Member.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/Member.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.util.Calendar;
@@ -29,7 +29,6 @@
* @author Shane Bryzak
*/
@Entity
- at Name("member")
@Table(uniqueConstraints = @UniqueConstraint(columnNames = "membername"))
public class Member implements Serializable
{
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberAccount.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberAccount.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberAccount.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.util.Set;
@@ -14,11 +14,11 @@
import javax.persistence.UniqueConstraint;
import org.hibernate.validator.NotNull;
-import org.jboss.seam.annotations.security.management.PasswordSalt;
-import org.jboss.seam.annotations.security.management.UserEnabled;
-import org.jboss.seam.annotations.security.management.UserPassword;
-import org.jboss.seam.annotations.security.management.UserPrincipal;
-import org.jboss.seam.annotations.security.management.UserRoles;
+import org.jboss.seam.security.annotations.management.PasswordSalt;
+import org.jboss.seam.security.annotations.management.UserEnabled;
+import org.jboss.seam.security.annotations.management.UserPassword;
+import org.jboss.seam.security.annotations.management.UserPrincipal;
+import org.jboss.seam.security.annotations.management.UserRoles;
@Entity
@Table(uniqueConstraints = @UniqueConstraint(columnNames = "username"))
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberBlog.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberBlog.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberBlog.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -16,11 +16,9 @@
import javax.persistence.PrePersist;
import javax.persistence.Transient;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.security.annotations.Restrict;
@Entity
- at Name("memberBlog")
public class MemberBlog implements Serializable
{
private static final long serialVersionUID = 7824113911888715595L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberFriend.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberFriend.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberFriend.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
@@ -8,10 +8,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import org.jboss.seam.annotations.Name;
-
@Entity
- at Name("memberFriend")
public class MemberFriend implements Serializable
{
private static final long serialVersionUID = -167586088947004386L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberImage.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberImage.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberImage.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
@@ -9,8 +9,8 @@
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import org.jboss.seam.annotations.security.permission.Permission;
-import org.jboss.seam.annotations.security.permission.Permissions;
+import org.jboss.seam.security.annotations.permission.Permission;
+import org.jboss.seam.security.annotations.permission.Permissions;
@Permissions({
@Permission(action = "view"),
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberRole.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberRole.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/MemberRole.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,4 +1,4 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
import java.io.Serializable;
import java.util.Set;
@@ -10,9 +10,9 @@
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
-import org.jboss.seam.annotations.security.management.RoleConditional;
-import org.jboss.seam.annotations.security.management.RoleGroups;
-import org.jboss.seam.annotations.security.management.RoleName;
+import org.jboss.seam.security.annotations.management.RoleConditional;
+import org.jboss.seam.security.annotations.management.RoleGroups;
+import org.jboss.seam.security.annotations.management.RoleName;
@Entity
public class MemberRole implements Serializable
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,17 +1,10 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
+import javax.enterprise.inject.Model;
import javax.persistence.EntityManager;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.Conversation;
-
- at Scope(CONVERSATION)
- at Name("pictureAction")
+ at Model
public class PictureAction
{
private MemberImage memberImage;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureSearch.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureSearch.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/PictureSearch.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,22 +1,17 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.EVENT;
import java.io.Serializable;
import java.util.List;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
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.annotations.Scope;
-import org.jboss.seam.annotations.security.Delete;
-import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.security.Identity;
- at Name("pictureSearch")
- at Scope(EVENT)
+ at RequestScoped
+ at Named
public class PictureSearch implements Serializable
{
private static final long serialVersionUID = -1868188969326866331L;
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ProfileAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ProfileAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/ProfileAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,25 +1,17 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
-import static org.jboss.seam.ScopeType.EVENT;
import java.util.List;
import java.util.Random;
import javax.ejb.Remove;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
-import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.Factory;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
-import org.jboss.seam.annotations.web.RequestParameter;
-import org.jboss.seam.annotations.Scope;
-
- at Name("profile")
- at Scope(EVENT)
+ at RequestScoped
+ at Named
public class ProfileAction
{
@RequestParameter
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/RegisterAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/RegisterAction.java 2010-03-25 02:33:21 UTC (rev 12264)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/RegisterAction.java 2010-03-25 03:15:31 UTC (rev 12265)
@@ -1,27 +1,17 @@
-package org.jboss.seam.example.seamspace;
+package org.jboss.seam.security.examples.seamspace;
-import static org.jboss.seam.ScopeType.CONVERSATION;
-
import java.util.Date;
import javax.ejb.Remove;
+import javax.enterprise.inject.Model;
import javax.persistence.EntityManager;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.End;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Observer;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Identity;
import org.jboss.seam.security.RunAsOperation;
import org.jboss.seam.security.management.IdentityManager;
import org.jboss.seam.security.management.JpaIdentityStore;
- at Scope(CONVERSATION)
- at Name("register")
+ at Model
public class RegisterAction
{
private Member member;
More information about the seam-commits
mailing list