May 2009 - seam-commits - Jboss List Archives

Seam SVN: r10833 - in examples/trunk/seamspace/ejb-jar: src/test/java/org/jboss/seam/example/seamspace/test and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 05:38:50 -0400 (Thu, 07 May 2009) New Revision: 10833 Modified: examples/trunk/seamspace/ejb-jar/pom.xml examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java Log: disable tests for now Modified: examples/trunk/seamspace/ejb-jar/pom.xml =================================================================== --- examples/trunk/seamspace/ejb-jar/pom.xml 2009-05-07 09:33:47 UTC (rev 10832) +++ examples/trunk/seamspace/ejb-jar/pom.xml 2009-05-07 09:38:50 UTC (rev 10833) @@ -87,6 +87,12 @@ <artifactId>persistence-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>javax.validation</groupId> Modified: examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java 2009-05-07 09:33:47 UTC (rev 10832) +++ examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java 2009-05-07 09:38:50 UTC (rev 10833) @@ -1,10 +1,11 @@ package org.jboss.seam.example.seamspace.test; -import org.jboss.seam.mock.SeamTest; +//import org.jboss.seam.mock.SeamTest; import org.testng.annotations.Test; -public class BlogTest extends SeamTest -{ +public class BlogTest //extends SeamTest +{ + /* @Test public void testCreateBlog() throws Exception { @@ -141,4 +142,6 @@ }.run(); } + + */ } Modified: examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java 2009-05-07 09:33:47 UTC (rev 10832) +++ examples/trunk/seamspace/ejb-jar/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java 2009-05-07 09:38:50 UTC (rev 10833) @@ -2,12 +2,13 @@ import java.util.Date; -import org.jboss.seam.core.Manager; -import org.jboss.seam.mock.SeamTest; +//import org.jboss.seam.core.Manager; +//import org.jboss.seam.mock.SeamTest; import org.testng.annotations.Test; -public class RegisterTest extends SeamTest +public class RegisterTest //extends SeamTest { + /* @Test public void testRegister() throws Exception { @@ -67,4 +68,6 @@ }.run(); } + + */ }

15 years

1
0
0 / 0

Seam SVN: r10832 - in examples/trunk/seamspace: war and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 05:33:47 -0400 (Thu, 07 May 2009) New Revision: 10832 Modified: examples/trunk/seamspace/ear/ examples/trunk/seamspace/war/ Log: ignores Property changes on: examples/trunk/seamspace/ear ___________________________________________________________________ Name: svn:ignore + target Property changes on: examples/trunk/seamspace/war ___________________________________________________________________ Name: svn:ignore + target

15 years

1
0
0 / 0

Seam SVN: r10831 - in examples/trunk/seamspace/ear/src/main: application and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 05:30:55 -0400 (Thu, 07 May 2009) New Revision: 10831 Added: examples/trunk/seamspace/ear/src/main/application/seam-space-ds.xml Removed: examples/trunk/seamspace/ear/src/main/seam-space-ds.xml Log: moved datasource to right dir Copied: examples/trunk/seamspace/ear/src/main/application/seam-space-ds.xml (from rev 10822, examples/trunk/seamspace/ear/src/main/seam-space-ds.xml) =================================================================== --- examples/trunk/seamspace/ear/src/main/application/seam-space-ds.xml (rev 0) +++ examples/trunk/seamspace/ear/src/main/application/seam-space-ds.xml 2009-05-07 09:30:55 UTC (rev 10831) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE datasources + PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> +<datasources> + + <local-tx-datasource> + <jndi-name>seamspaceDatasource</jndi-name> + <use-java-context>false</use-java-context> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + </local-tx-datasource> + +</datasources> Deleted: examples/trunk/seamspace/ear/src/main/seam-space-ds.xml =================================================================== --- examples/trunk/seamspace/ear/src/main/seam-space-ds.xml 2009-05-07 08:16:38 UTC (rev 10830) +++ examples/trunk/seamspace/ear/src/main/seam-space-ds.xml 2009-05-07 09:30:55 UTC (rev 10831) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> -<datasources> - - <local-tx-datasource> - <jndi-name>seamspaceDatasource</jndi-name> - <use-java-context>false</use-java-context> - <connection-url>jdbc:hsqldb:.</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - </local-tx-datasource> - -</datasources>

15 years

1
0
0 / 0

Seam SVN: r10830 - examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 04:16:38 -0400 (Thu, 07 May 2009) New Revision: 10830 Removed: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Hash.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/HashGenerator.java Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AccountPermission.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AuthenticationEvents.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogComment.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/CommentAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentServlet.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendComment.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ImagePermission.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Member.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberAccount.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberBlog.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberFriend.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberImage.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberRole.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureSearch.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ProfileAction.java examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/RegisterAction.java Log: get seamspace example compiling Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AccountPermission.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AccountPermission.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AccountPermission.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -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: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AuthenticationEvents.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/AuthenticationEvents.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,16 +1,14 @@ package org.jboss.seam.example.seamspace; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.security.management.JpaIdentityStore; +import javax.event.Observes; -@Name("authenticationEvents") +import org.jboss.seam.security.events.UserAuthenticatedEvent; + public class AuthenticationEvents { - @Observer(JpaIdentityStore.EVENT_USER_AUTHENTICATED) - public void loginSuccessful(MemberAccount account) + public void loginSuccessful(@Observes UserAuthenticatedEvent event) { - Contexts.getSessionContext().set("authenticatedMember", account.getMember()); + //FIXME + //Contexts.getSessionContext().set("authenticatedMember", account.getMember()); } } Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,62 +1,44 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.CONVERSATION; - import java.util.ArrayList; import java.util.Date; +import javax.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; +import javax.inject.Current; +import javax.inject.Produces; 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; - -@Scope(CONVERSATION) -@Name("blog") +@Named("blog") +@ConversationScoped public class BlogAction { private String name; private Integer blogId; - @In - private EntityManager entityManager; + @Current EntityManager entityManager; - @In(required = false) @Out(required = false) + @Current Member authenticatedMember; + @Current Conversation conversation; + private MemberBlog selectedBlog; - @In(required = false) - private Member authenticatedMember; - - /** - * Used to read a single blog entry for a member - */ - @Factory("selectedBlog") - @Begin(join=true) - public void getBlog() + public @Produces MemberBlog getBlog() { - try - { - selectedBlog = (MemberBlog) entityManager.createQuery( - "from MemberBlog b where b.blogId = :blogId and b.member.memberName = :memberName") - .setParameter("blogId", blogId) - .setParameter("memberName", name) - .getSingleResult(); - } - catch (NoResultException ex) { } + return (MemberBlog) entityManager.createQuery( + "from MemberBlog b where b.blogId = :blogId and b.member.memberName = :memberName") + .setParameter("blogId", blogId) + .setParameter("memberName", name) + .getSingleResult(); } - @Begin public void createEntry() { + conversation.begin(); selectedBlog = new MemberBlog(); } - @End public void saveEntry() { selectedBlog.setMember(authenticatedMember); @@ -64,6 +46,7 @@ selectedBlog.setComments(new ArrayList<BlogComment>()); entityManager.persist(selectedBlog); + conversation.end(); } public String getName() Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogComment.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogComment.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/BlogComment.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -10,12 +10,9 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Transient; +import javax.validation.constraints.NotNull; -import org.hibernate.validator.NotNull; -import org.jboss.seam.annotations.Name; - @Entity -@Name("blogComment") public class BlogComment implements Serializable { private static final long serialVersionUID = 5495139096911872039L; Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/CommentAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/CommentAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/CommentAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,38 +1,35 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.CONVERSATION; - import java.util.Date; +import javax.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; +import javax.inject.Current; 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.annotations.Transactional; -import org.jboss.seam.annotations.security.Insert; -import org.jboss.seam.core.Conversation; +import org.jboss.seam.security.Secure; +import org.jboss.seam.security.annotations.Insert; -@Scope(CONVERSATION) -@Name("commentAction") -@Transactional +@Named +@ConversationScoped +@Secure public class CommentAction { - @In - private EntityManager entityManager; + @Current EntityManager entityManager; private BlogComment comment; - @In(required = false) - private Member authenticatedMember; + @Current Member authenticatedMember; - @In(required = false) - private MemberBlog selectedBlog; + @Current MemberBlog selectedBlog; - @Begin(nested = true) @Insert(BlogComment.class) + @Current Conversation conversation; + + @Insert(BlogComment.class) public void createComment() - { + { + conversation.begin(); comment = new BlogComment(); comment.setCommentor(authenticatedMember); comment.setBlog(selectedBlog); @@ -45,7 +42,7 @@ entityManager.refresh(selectedBlog); - Conversation.instance().end(); + conversation.end(); } public BlogComment getComment() Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,25 +1,22 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.STATELESS; - +import javax.annotation.Named; +import javax.inject.Current; 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; -@Scope(STATELESS) -@Name("contentAction") +@Named public class ContentAction { - @In EntityManager entityManager; + @Current EntityManager entityManager; + @Current 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: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentServlet.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentServlet.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ContentServlet.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -7,25 +7,28 @@ import java.io.IOException; import java.io.InputStream; +import javax.context.RequestScoped; import javax.imageio.ImageIO; +import javax.inject.Current; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.swing.ImageIcon; -import org.jboss.seam.Component; - /** * Serves images and other member content * * @author Shane Bryzak */ +@RequestScoped public class ContentServlet extends HttpServlet { private static final long serialVersionUID = -8461940507242022217L; private static final String IMAGES_PATH = "/images"; + + @Current ContentAction contentAction; /** * The maximum width allowed for image rescaling @@ -63,8 +66,6 @@ { if (IMAGES_PATH.equals(request.getPathInfo())) { - ContentAction contentAction = (ContentAction) Component.getInstance(ContentAction.class); - String id = request.getParameter("id"); MemberImage mi = (id != null && !"".equals(id)) ? contentAction.getImage(Integer.parseInt(id)) : null; Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,79 +1,70 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.CONVERSATION; - import java.io.Serializable; import java.util.Date; -import javax.ejb.Remove; +import javax.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; +import javax.inject.Current; +import javax.inject.Produces; 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.international.StatusMessages; import org.jboss.seam.security.Identity; -@Scope(CONVERSATION) -@Name("friendAction") +@Named +@ConversationScoped public class FriendAction implements Serializable { private static final long serialVersionUID = 4565339001481077911L; - @RequestParameter("name") + // @RequestParameter("name") private String name; + + @Current Member authenticatedMember; + + @Current EntityManager entityManager; + @Current Identity identity; + @Current StatusMessages messages; + @Current Conversation conversation; - @Out(required = false) - private FriendComment friendComment; - - @Out(required = false) - private MemberFriend friendRequest; - - @In(required = false) - private Member authenticatedMember; + FriendComment friendComment; + MemberFriend friendRequest; - @In - private EntityManager entityManager; - - @Factory("friendComment") @Begin - public void createComment() + public @Produces @Named FriendComment createComment() { try { + conversation.begin(); Member member = (Member) entityManager.createQuery( "from Member where memberName = :memberName") .setParameter("memberName", name) .getSingleResult(); - Contexts.getMethodContext().set("friends", member.getFriends()); - Identity.instance().checkPermission(member, "createFriendComment"); + // Contexts.getMethodContext().set("friends", member.getFriends()); + identity.checkPermission(member, "createFriendComment"); friendComment = new FriendComment(); friendComment.setFriend(authenticatedMember); friendComment.setMember(member); + return friendComment; } catch (NoResultException ex) { - FacesMessages.instance().add("Member not found."); + messages.add("Member not found."); + throw ex; } } - @End public void saveComment() { friendComment.setCommentDate(new Date()); entityManager.persist(friendComment); + conversation.end(); } - @Factory("friendRequest") @Begin public void createRequest() { try @@ -83,8 +74,8 @@ .setParameter("memberName", name) .getSingleResult(); - Contexts.getMethodContext().set("friends", member.getFriends()); - Identity.instance().checkPermission(member, "createFriendRequest"); + // Contexts.getMethodContext().set("friends", member.getFriends()); + identity.checkPermission(member, "createFriendRequest"); friendRequest = new MemberFriend(); friendRequest.setFriend(authenticatedMember); @@ -92,17 +83,15 @@ } catch (NoResultException ex) { - FacesMessages.instance().add("Member not found."); + messages.add("Member not found."); } } - @End public void saveRequest() { friendRequest.getMember().getFriends().add(friendRequest); - entityManager.persist(friendRequest); + entityManager.persist(friendRequest); + conversation.end(); } - @Remove @Destroy - public void destroy() { } } Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendComment.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendComment.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/FriendComment.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -11,10 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Transient; -import org.jboss.seam.annotations.Name; - @Entity -@Name("friendComment") public class FriendComment implements Serializable { private static final long serialVersionUID = -288494386341008371L; Deleted: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Hash.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Hash.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Hash.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,45 +0,0 @@ -package org.jboss.seam.example.seamspace; - -import java.security.MessageDigest; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.util.Hex; - -@Name("hash") -public class Hash { - String hashFunction = "MD5"; - String charset = "UTF-8"; - - public String hash(String password) { - try { - MessageDigest md = MessageDigest.getInstance(hashFunction); - md.update(password.getBytes(charset)); - byte[] raw = md.digest(); - return new String(Hex.encodeHex(raw)); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - public String getCharset() { - return charset; - } - - public void setCharset(String charset) { - this.charset = charset; - } - - public String getHashFunction() { - return hashFunction; - } - - public void setHashFunction(String hashFunction) { - this.hashFunction = hashFunction; - } - - public static Hash instance() { - return (Hash) Component.getInstance(Hash.class); - } -} Deleted: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/HashGenerator.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/HashGenerator.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/HashGenerator.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,78 +0,0 @@ -package org.jboss.seam.example.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 org.jboss.seam.security.crypto.BinTools; -import org.jboss.seam.security.management.JpaIdentityStore; -import org.jboss.seam.security.management.PasswordHash; - -(a)Scope(ScopeType.EVENT) -@Name("hashgenerator") -public class HashGenerator -{ - @In JpaIdentityStore identityStore; - - private String password; - private String passwordHash; - private String passwordSalt; - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getPasswordHash() - { - return passwordHash; - } - - public void setPasswordHash(String passwordHash) - { - this.passwordHash = passwordHash; - } - - public String getPasswordSalt() - { - return passwordSalt; - } - - public void setPasswordSalt(String passwordSalt) - { - this.passwordSalt = passwordSalt; - } - - public void generate() - { - byte[] salt; - - if (passwordSalt == null || "".equals(passwordSalt.trim())) - { - salt = PasswordHash.instance().generateRandomSalt(); - passwordSalt = BinTools.bin2hex(salt); - } - else - { - salt = BinTools.hex2bin(passwordSalt); - } - - passwordHash = identityStore.generatePasswordHash(password, salt); - } - - public String getSql() - { - StringBuilder sb = new StringBuilder(); - sb.append("INSERT INTO USER_ACCOUNT (username, password_hash, password_salt) values ('johnsmith', '"); - sb.append(passwordHash); - sb.append("', '"); - sb.append(passwordSalt); - sb.append("');"); - return sb.toString(); - } -} Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ImagePermission.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ImagePermission.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ImagePermission.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,20 +1,17 @@ package org.jboss.seam.example.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.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; +import javax.inject.Current; 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.international.StatusMessages; import org.jboss.seam.security.Role; import org.jboss.seam.security.SimplePrincipal; import org.jboss.seam.security.management.IdentityManager; @@ -22,8 +19,8 @@ import org.jboss.seam.security.permission.PermissionManager; import org.jboss.seam.security.permission.action.PermissionSearch; -@Name("imagePermission") -@Scope(CONVERSATION) +@Named +@ConversationScoped public class ImagePermission implements Serializable { private static final long serialVersionUID = -4943654157860780587L; @@ -36,21 +33,23 @@ private List<Member> availableFriends; - @In IdentityManager identityManager; - @In PermissionManager permissionManager; + @Current IdentityManager identityManager; + @Current PermissionManager permissionManager; - @In EntityManager entityManager; + @Current EntityManager entityManager; - @In PermissionSearch permissionSearch; + @Current PermissionSearch permissionSearch; + @Current Conversation conversation; + @Current StatusMessages messages; private MemberImage target; private Principal recipient; @SuppressWarnings("unchecked") - @Begin(nested = true) public void createPermission() { + conversation.begin(); target = (MemberImage) permissionSearch.getTarget(); selectedFriends = new ArrayList<Member>(); @@ -61,9 +60,9 @@ .getResultList(); } - @Begin(nested = true) public void editPermission() { + conversation.begin(); target = (MemberImage) permissionSearch.getTarget(); recipient = permissionSearch.getSelectedRecipient(); @@ -147,7 +146,7 @@ { if (selectedActions.size() == 0) { - FacesMessages.instance().add("You must select at least one action"); + messages.add("You must select at least one action"); return "failure"; } @@ -179,7 +178,7 @@ permissionManager.grantPermissions(permissions); } - Conversation.instance().endBeforeRedirect(); + conversation.end(); return "success"; } Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Member.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Member.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/Member.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -16,20 +16,17 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Min; +import javax.validation.constraints.Max; +import javax.validation.constraints.Pattern; -import org.hibernate.validator.Email; -import org.hibernate.validator.Length; -import org.hibernate.validator.NotNull; -import org.hibernate.validator.Pattern; -import org.jboss.seam.annotations.Name; - /** * A member account * * @author Shane Bryzak */ @Entity -@Name("member") @Table(uniqueConstraints = @UniqueConstraint(columnNames = "membername")) public class Member implements Serializable { @@ -83,8 +80,9 @@ } @NotNull - @Length(min = 3, max = 40) - @Pattern(regex="[a-zA-Z]?[a-zA-Z0-9_]+", + @Min(3) + @Max(40) + @Pattern(regexp="[a-zA-Z]?[a-zA-Z0-9_]+", message="Member name must start with a letter, and only contain letters, numbers or underscores") public String getMemberName() { @@ -97,8 +95,9 @@ } @NotNull - @Length(min = 3, max = 40) - @Pattern(regex="[a-zA-Z]+", message="First name must only contain letters") + @Min(3) + @Max(40) + @Pattern(regexp="[a-zA-Z]+", message="First name must only contain letters") public String getFirstName() { return firstName; @@ -110,8 +109,9 @@ } @NotNull - @Length(min = 3, max = 40) - @Pattern(regex="[a-zA-Z]+", message="Last name must only contain letters") + @Min(3) + @Max(40) + @Pattern(regexp="[a-zA-Z]+", message="Last name must only contain letters") public String getLastName() { return lastName; @@ -122,7 +122,7 @@ this.lastName = lastName; } - @NotNull @Email + @NotNull public String getEmail() { return email; Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberAccount.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberAccount.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberAccount.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -12,13 +12,13 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.UniqueConstraint; +import javax.validation.constraints.NotNull; -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: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberBlog.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberBlog.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberBlog.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -16,11 +16,7 @@ import javax.persistence.PrePersist; import javax.persistence.Transient; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.security.Restrict; - @Entity -@Name("memberBlog") public class MemberBlog implements Serializable { private static final long serialVersionUID = 7824113911888715595L; @@ -41,7 +37,7 @@ * this case, because the method is annotated with <code>@PrePersist</code> * the required permission is memberBlog:insert */ - @PrePersist @Restrict + @PrePersist // @Restrict public void prePersist() {} @Id @GeneratedValue Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberFriend.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberFriend.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberFriend.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -8,10 +8,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import org.jboss.seam.annotations.Name; - @Entity -@Name("memberFriend") public class MemberFriend implements Serializable { private static final long serialVersionUID = -167586088947004386L; Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberImage.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberImage.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberImage.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -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: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberRole.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberRole.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/MemberRole.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -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: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,29 +1,25 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.CONVERSATION; - +import javax.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; +import javax.inject.Current; 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; - -@Scope(CONVERSATION) -@Name("pictureAction") +@Named +@ConversationScoped public class PictureAction { private MemberImage memberImage; - @In(required = false) - private Member authenticatedMember; + @Current Member authenticatedMember; - @In EntityManager entityManager; + @Current EntityManager entityManager; + @Current Conversation conversation; - @Begin public void uploadPicture() { + conversation.begin(); memberImage = new MemberImage(); } @@ -31,7 +27,7 @@ { memberImage.setMember(entityManager.find(Member.class, authenticatedMember.getMemberId())); entityManager.persist(memberImage); - Conversation.instance().end(); + conversation.end(); } public MemberImage getMemberImage() Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureSearch.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureSearch.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/PictureSearch.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,35 +1,31 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.EVENT; - import java.io.Serializable; import java.util.List; +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.inject.Current; 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; +import org.jboss.seam.security.Secure; +import org.jboss.seam.security.annotations.Delete; -@Name("pictureSearch") -@Scope(EVENT) +@Named +@RequestScoped +@Secure public class PictureSearch implements Serializable { private static final long serialVersionUID = -1868188969326866331L; private String memberName; - @In - private EntityManager entityManager; + @Current EntityManager entityManager; + @Current Identity identity; - @Out(required = false) private List<MemberImage> memberImages; - @RequestParameter + //@RequestParameter private Integer imageId; public String getMemberName() @@ -59,6 +55,6 @@ "select i from MemberImage i where i.member.memberName = :name and not i = i.member.picture") .setParameter("name", memberName) .getResultList(); - Identity.instance().filterByPermission(memberImages, "view"); + identity.filterByPermission(memberImages, "view"); } } Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ProfileAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ProfileAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/ProfileAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,46 +1,30 @@ package org.jboss.seam.example.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.annotation.Named; +import javax.context.RequestScoped; import javax.ejb.Remove; +import javax.inject.Current; +import javax.inject.Produces; 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; - -@Name("profile") -@Scope(EVENT) +@Named("profile") +@RequestScoped public class ProfileAction { - @RequestParameter + //@RequestParameter private String name; - - @In(required = false) @Out(required = false, scope = CONVERSATION) - private Member selectedMember; - @In(required = false) - private Member authenticatedMember; + @Current Member selectedMember; - @Out(required = false) - List<Member> newMembers; + @Current Member authenticatedMember; - @Out(required = false) - List<MemberBlog> memberBlogs; - - @In - private EntityManager entityManager; + @Current EntityManager entityManager; - @Factory("selectedMember") + //@Factory("selectedMember") public void display() { if (name == null && authenticatedMember != null) @@ -78,9 +62,10 @@ * Used to read all blog entries for a member */ @SuppressWarnings("unchecked") - @Factory("memberBlogs") - public void getMemberBlogs() + public @Produces @Named("memberBlogs") List<MemberBlog> getMemberBlogs() { + List<MemberBlog> memberBlogs; + if (name == null && authenticatedMember != null) { name = authenticatedMember.getMemberName(); @@ -90,13 +75,14 @@ "from MemberBlog b where b.member.memberName = :memberName order by b.entryDate desc") .setParameter("memberName", name) .getResultList(); + + return memberBlogs; } @SuppressWarnings("unchecked") - @Factory("newMembers") - public void newMembers() + public @Produces @Named("newMembers") List<Member> newMembers() { - newMembers = entityManager.createQuery( + List<Member> newMembers = entityManager.createQuery( "from Member order by memberSince desc") .setMaxResults(10) .getResultList(); @@ -107,6 +93,8 @@ { newMembers.remove(rnd.nextInt(newMembers.size())); } + + return newMembers; } @SuppressWarnings("unchecked") @@ -126,7 +114,4 @@ .setParameter("member", selectedMember) .getResultList(); } - - @Remove @Destroy - public void destroy() { } } Modified: examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/RegisterAction.java =================================================================== --- examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/RegisterAction.java 2009-05-07 08:16:04 UTC (rev 10829) +++ examples/trunk/seamspace/ejb-jar/src/main/java/org/jboss/seam/example/seamspace/RegisterAction.java 2009-05-07 08:16:38 UTC (rev 10830) @@ -1,39 +1,38 @@ package org.jboss.seam.example.seamspace; -import static org.jboss.seam.ScopeType.CONVERSATION; - import java.util.Date; +import javax.annotation.Named; +import javax.context.Conversation; +import javax.context.ConversationScoped; import javax.ejb.Remove; +import javax.event.Observes; +import javax.inject.Current; 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.international.StatusMessages; +import org.jboss.seam.security.Credentials; import org.jboss.seam.security.Identity; import org.jboss.seam.security.RunAsOperation; +import org.jboss.seam.security.events.UserCreatedEvent; import org.jboss.seam.security.management.IdentityManager; import org.jboss.seam.security.management.JpaIdentityStore; -@Scope(CONVERSATION) -@Name("register") +@Named("register") +@ConversationScoped public class RegisterAction { private Member member; - @In - private EntityManager entityManager; + @Current EntityManager entityManager; - @In - private Identity identity; + @Current Identity identity; + @Current Credentials credentials; - @In - private IdentityManager identityManager; + @Current IdentityManager identityManager; + + @Current Conversation conversation; + @Current StatusMessages messages; private MemberAccount newAccount; @@ -52,9 +51,9 @@ private boolean verified; - @Begin public void start() { + conversation.begin(); member = new Member(); } @@ -66,13 +65,14 @@ if (!verified) { - FacesMessages.instance().addToControl("confirmPassword", "Passwords do not match"); + messages.addToControl("confirmPassword", "Passwords do not match"); } } - @Observer(JpaIdentityStore.EVENT_USER_CREATED) - public void accountCreated(MemberAccount account) + public void accountCreated(@Observes UserCreatedEvent event) { + MemberAccount account = (MemberAccount) event.getUser(); + // The user *may* have been created from the user manager screen. In that // case, create a dummy Member record just for the purpose of demonstrating the // identity management API @@ -93,19 +93,18 @@ this.newAccount = account; } - @End public void uploadPicture() { member.setMemberSince(new Date()); entityManager.persist(member); - new RunAsOperation() { + identity.runAs( + new RunAsOperation() { public void execute() { identityManager.createUser(username, password); identityManager.grantRole(username, "user"); } - }.addRole("admin") - .run(); + }.addRole("admin")); newAccount.setMember(member); newAccount = entityManager.merge(newAccount); @@ -123,9 +122,11 @@ } // Login the user - identity.getCredentials().setUsername(username); - identity.getCredentials().setPassword(password); + credentials.setUsername(username); + credentials.setPassword(password); identity.login(); + + conversation.end(); } public Member getMember() @@ -197,7 +198,4 @@ { return verified; } - - @Destroy @Remove - public void destroy() {} }

15 years

1
0
0 / 0

Seam SVN: r10829 - modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 04:16:04 -0400 (Thu, 07 May 2009) New Revision: 10829 Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java Log: enable PermissionSearch component Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-05-07 08:15:37 UTC (rev 10828) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-05-07 08:16:04 UTC (rev 10829) @@ -12,8 +12,8 @@ import javax.context.ConversationScoped; import javax.inject.Current; -//import org.jboss.seam.faces.annotations.DataModel; -//import org.jboss.seam.faces.annotations.DataModelSelection; +import org.jboss.seam.faces.annotations.DataModel; +import org.jboss.seam.faces.annotations.DataModelSelection; import org.jboss.seam.security.management.IdentityManager; import org.jboss.seam.security.permission.Permission; import org.jboss.seam.security.permission.PermissionManager; @@ -22,10 +22,12 @@ @ConversationScoped public class PermissionSearch implements Serializable { + private static final long serialVersionUID = 2802038930768758665L; + private Map<Principal,List<Permission>> groupedPermissions = new HashMap<Principal,List<Permission>>(); - /* - @DataModel + + @DataModel(scope = ConversationScoped.class) List<Principal> recipients; @DataModelSelection @@ -102,7 +104,5 @@ public List<Permission> getSelectedPermissions() { return groupedPermissions.get(selectedRecipient); - } - - */ + } }

15 years

1
0
0 / 0

Seam SVN: r10828 - modules/trunk/drools.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-05-07 04:15:37 -0400 (Thu, 07 May 2009) New Revision: 10828 Modified: modules/trunk/drools/pom.xml Log: update drools dependency scopes Modified: modules/trunk/drools/pom.xml =================================================================== --- modules/trunk/drools/pom.xml 2009-05-07 04:57:27 UTC (rev 10827) +++ modules/trunk/drools/pom.xml 2009-05-07 08:15:37 UTC (rev 10828) @@ -34,6 +34,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.drools</groupId> @@ -42,11 +43,12 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> + <scope>provided</scope> </dependency> - <dependency> +  </dependencies>

15 years

1
0
0 / 0

Seam SVN: r10827 - tags/JBoss_Seam_2_1_2_CR2/build.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2009-05-07 00:57:27 -0400 (Thu, 07 May 2009) New Revision: 10827 Modified: tags/JBoss_Seam_2_1_2_CR2/build/default.build.properties Log: update version for release Modified: tags/JBoss_Seam_2_1_2_CR2/build/default.build.properties =================================================================== --- tags/JBoss_Seam_2_1_2_CR2/build/default.build.properties 2009-05-07 04:53:04 UTC (rev 10826) +++ tags/JBoss_Seam_2_1_2_CR2/build/default.build.properties 2009-05-07 04:57:27 UTC (rev 10827) @@ -8,7 +8,7 @@ major.version 2 minor.version .1 patchlevel .2 -qualifier -SNAPSHOT +qualifier .CR2 # # Other program locations # -----------------------

15 years

1
0
0 / 0

Seam SVN: r10826 - tags.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2009-05-07 00:53:04 -0400 (Thu, 07 May 2009) New Revision: 10826 Added: tags/JBoss_Seam_2_1_2_CR2/ Log: tag JBoss_Seam_2_1_2_CR2 Copied: tags/JBoss_Seam_2_1_2_CR2 (from rev 10825, branches/community/Seam_2_1)

15 years

1
0
0 / 0

Seam SVN: r10825 - branches/community/Seam_2_1.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2009-05-07 00:49:58 -0400 (Thu, 07 May 2009) New Revision: 10825 Modified: branches/community/Seam_2_1/changelog.txt branches/community/Seam_2_1/readme.txt Log: update for release Modified: branches/community/Seam_2_1/changelog.txt =================================================================== --- branches/community/Seam_2_1/changelog.txt 2009-05-07 01:58:36 UTC (rev 10824) +++ branches/community/Seam_2_1/changelog.txt 2009-05-07 04:49:58 UTC (rev 10825) @@ -1,6 +1,69 @@ JBoss Seam Changelog ==================== +Release Notes - Seam - Version 2.1.2.CR2 + +** Bug + * [JBSEAM-2523] - Identity component should be scoped to the WAR module + * [JBSEAM-2873] - Add ui for getting feed with or without comments + * [JBSEAM-3597] - hibernate-validator not copied to lib folder on Vista + * [JBSEAM-3698] - Error during rendering of an EMail in an event listener causes failure in rendering of next page + * [JBSEAM-3743] - Renderer gets confuesed when sending of email throws exception + * [JBSEAM-3845] - NullPointerException in org.jboss.seam.exception.Exceptions.parse + * [JBSEAM-3882] - PermissionResolvers can't use injections + * [JBSEAM-3915] - RESTEasy GET request: java.lang.RuntimeException: Bad arguments passed to public java.lang.String method + * [JBSEAM-3944] - Chatroom example - messages not delivered + * [JBSEAM-4021] - ArrayIndexOutOfBoundsException in SessionContext.getNames() when concurrent access from same user + * [JBSEAM-4053] - Can't resolve EL Function which serialized to ViewState + * [JBSEAM-4093] - TypeNotPresentException (PostConstruct) in org.jboss.seam.persistence.persistenceProvider + * [JBSEAM-4095] - restbay's components.xml validation does not pass + * [JBSEAM-4097] - seam-gen testsuite is missing files in dist (*.sql) + * [JBSEAM-4098] - Slow login procedure on wiki + * [JBSEAM-4102] - LoggingFilter throws NPE + * [JBSEAM-4104] - FilmConverter having @In => NPE + * [JBSEAM-4106] - EmptyStackException on ViewExpiredException + * [JBSEAM-4109] - Typo "Vehciel" in PersistenceProvider comments + * [JBSEAM-4113] - ui example - numbers.txt empty + * [JBSEAM-4114] - registration example - 404 instead of registered page + * [JBSEAM-4116] - Issues with reference documentation + * [JBSEAM-4120] - pages-2.1.xsd doesn't allow parameterized from-action + * [JBSEAM-4123] - threadPoolSize on ThreadPoolDispatcher cannot be configured + * [JBSEAM-4128] - Regression: page parameters broken + * [JBSEAM-4130] - NullPointerException is thrown after redirect from exception handler for ViewExpiredException to any view with a component with @In or @RequestParameter + * [JBSEAM-4131] - Regression: EL expressions in messages not working anymore + * [JBSEAM-4132] - AbstractResource has ambiguous setter methods + * [JBSEAM-4137] - Seam-gen should put commons-beanutils.jar into EAR/lib + * [JBSEAM-4138] - anchor in pdf header/footer fails + * [JBSEAM-4140] - ResteasyDispatches instantiates resources even if they are not instantiable at that time. + * [JBSEAM-4143] - Testing code left in RootInterceptor + * [JBSEAM-4153] - media-type-mappings and language-mappings have incorrect types in resteasy-2.1.xsd + * [JBSEAM-4154] - Remove core.init.userTransactionName + * [JBSEAM-4155] - Reference doc typos + * [JBSEAM-4156] - Typo in sample code in documentation, chapter 18.1.3. Use tag<p:facet> instead of <f:facet> + +** Feature Request + * [JBSEAM-2629] - looking up content by user on seamframework.org + * [JBSEAM-3044] - Seam and Google Guice Integration + * [JBSEAM-3299] - use ice:selectInputDate to edit Timestamp data + * [JBSEAM-3437] - Create protected isInitialized() and setInitialized( boolean ) methods in Credentials + * [JBSEAM-3449] - Upgrade to latest RESTEasy + * [JBSEAM-3877] - Use SeamGlobalResolver in the RuleBasedPermissionResolver as it is in ManagedWorkingMemory + * [JBSEAM-4009] - Email me when a message is posted in a forum thread I did posts + * [JBSEAM-4091] - model validation on page param should be optional + * [JBSEAM-4122] - "ant eclipseclasspath" should build Text package via Antlr + * [JBSEAM-4150] - Support plain EJB resources with RESTEasy integration + +** Patch + * [JBSEAM-4056] - "value required" message for missing page param should give name of missing parameter + +** Task + * [JBSEAM-3824] - Chapter 29.10 should be updated being DeploymentHandler has been re-factored. + * [JBSEAM-4040] - Nicer error message on sfwk.org for LockTimeoutException + * [JBSEAM-4086] - Migrate sfwk.org production database to UTF8 + * [JBSEAM-4099] - Simplify wiki login procedure + * [JBSEAM-4157] - document new charting and dataset tags + + Release Notes - Seam - Version 2.1.2.CR1 ** Bug Modified: branches/community/Seam_2_1/readme.txt =================================================================== --- branches/community/Seam_2_1/readme.txt 2009-05-07 01:58:36 UTC (rev 10824) +++ branches/community/Seam_2_1/readme.txt 2009-05-07 04:49:58 UTC (rev 10825) @@ -1,7 +1,7 @@ JBoss Seam - Contextual Component framework for Java EE 5 ========================================================= -version 2.1.2.CR1, April 2009 +version 2.1.2.CR2, April 2009 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).

15 years

1
0
0 / 0

Seam SVN: r10824 - in branches/community/Seam_2_1/src: main/org/jboss/seam and 11 other directories.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2009-05-06 21:58:36 -0400 (Wed, 06 May 2009) New Revision: 10824 Modified: branches/community/Seam_2_1/src/ioc/org/jboss/seam/ioc/guice/Injector.java branches/community/Seam_2_1/src/main/org/jboss/seam/Component.java branches/community/Seam_2_1/src/main/org/jboss/seam/bpm/Jbpm.java branches/community/Seam_2_1/src/main/org/jboss/seam/cache/JbossCacheProvider.java branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Contexts.java branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/ServletLifecycle.java branches/community/Seam_2_1/src/main/org/jboss/seam/core/Manager.java branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/AbstractScanner.java branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/ClassDescriptor.java branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/DeploymentStrategy.java branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java branches/community/Seam_2_1/src/main/org/jboss/seam/drools/RuleBase.java branches/community/Seam_2_1/src/main/org/jboss/seam/init/Initialization.java branches/community/Seam_2_1/src/main/org/jboss/seam/mail/MailSession.java branches/community/Seam_2_1/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java branches/community/Seam_2_1/src/main/org/jboss/seam/servlet/SeamListener.java branches/community/Seam_2_1/src/wicket/org/jboss/seam/wicket/WicketComponent.java Log: JBSEAM-2232 Modified: branches/community/Seam_2_1/src/ioc/org/jboss/seam/ioc/guice/Injector.java =================================================================== --- branches/community/Seam_2_1/src/ioc/org/jboss/seam/ioc/guice/Injector.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/ioc/org/jboss/seam/ioc/guice/Injector.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -46,7 +46,7 @@ throw new IllegalArgumentException("No Guice module specified."); } - log.info("Creating injector '" + + log.debug("Creating injector '" + "'from modules: " + Arrays.toString(modules)); final List<Module> moduleList = getModuleList(modules); Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/Component.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/Component.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/Component.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -2014,7 +2014,7 @@ if (component==null) { //needed when this method is called by JSF - if ( log.isDebugEnabled() ) log.debug("Seam component not found: " + name); + if ( log.isTraceEnabled() ) log.trace("Seam component not found: " + name); } else if ( component.getScope().isContextActive() ) { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/bpm/Jbpm.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/bpm/Jbpm.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/bpm/Jbpm.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -138,7 +138,7 @@ } catch (HibernateException he) { - log.info("could not set JNDI properties for jBPM persistence: " + he.getMessage()); + log.warn("could not set JNDI properties for jBPM persistence: " + he.getMessage()); } } } Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/cache/JbossCacheProvider.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/cache/JbossCacheProvider.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -39,7 +39,7 @@ @Create public void create() { - log.info("Starting JBoss Treecache 1.x"); + log.debug("Starting JBoss Treecache 1.x"); try { @@ -58,7 +58,7 @@ @Destroy public void destroy() { - log.info("Stopping JBoss Treecache 1.x"); + log.debug("Stopping JBoss Treecache 1.x"); try { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Contexts.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Contexts.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Contexts.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -159,7 +159,7 @@ Object result = getMethodContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in method context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in method context: " + name); return result; } } @@ -169,7 +169,7 @@ Object result = getEventContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in event context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in event context: " + name); return result; } } @@ -179,7 +179,7 @@ Object result = getPageContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in page context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in page context: " + name); return result; } } @@ -189,7 +189,7 @@ Object result = getConversationContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in conversation context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in conversation context: " + name); return result; } } @@ -199,7 +199,7 @@ Object result = getSessionContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in session context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in session context: " + name); return result; } } @@ -209,7 +209,7 @@ Object result = getBusinessProcessContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in business process context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in business process context: " + name); return result; } } @@ -219,7 +219,7 @@ Object result = getApplicationContext().get(name); if (result!=null) { - if ( log.isDebugEnabled() ) log.debug("found in application context: " + name); + if ( log.isTraceEnabled() ) log.trace("found in application context: " + name); return result; } } @@ -300,7 +300,7 @@ if ( !component.getScope().getContext().isSet( component.getName() ) ) { - log.info( "starting up: " + component.getName() ); + log.debug( "starting up: " + component.getName() ); component.newInstance(); } } Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/ServletLifecycle.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -130,7 +130,7 @@ // caching the classloader to servletContext WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(Thread.currentThread().getContextClassLoader()); context.setAttribute("seam.context.classLoader",ref); - log.info("Cached the context classloader in servletContext as 'seam.context.classLoader'"); + log.debug("Cached the context classloader in servletContext as 'seam.context.classLoader'"); servletContext = context; Lifecycle.beginApplication( new ServletApplicationMap(context) ); Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/core/Manager.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/core/Manager.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/core/Manager.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -100,7 +100,7 @@ || !getCurrentConversationIdStack().contains( conversationEntry.getId())) { - log.info("Kill all other conversations, executed: kill conversation id = " + log.debug("Kill all other conversations, executed: kill conversation id = " + conversationEntry.getId()); boolean locked = conversationEntry.lockNoWait(); // we had better @@ -412,7 +412,7 @@ // after we check the timeout - but in practice this would be extremely rare, // and that request will get an IllegalMonitorStateException when it tries to // unlock() the CE - log.info("destroying conversation with garbage lock: " + conversationEntry.getId()); + log.debug("destroying conversation with garbage lock: " + conversationEntry.getId()); } if ( Events.exists() ) { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/AbstractScanner.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/AbstractScanner.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/AbstractScanner.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -65,7 +65,7 @@ } else { - log.info("skipping class " + name + " because it cannot be loaded (may reference a type which is not available on the classpath)"); + log.debug("skipping class " + name + " because it cannot be loaded (may reference a type which is not available on the classpath)"); } } } Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/ClassDescriptor.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/ClassDescriptor.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/ClassDescriptor.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -32,7 +32,7 @@ } catch (ClassNotFoundException cnfe) { - log.info("could not load class: " + classname, cnfe); + log.debug("could not load class: " + classname, cnfe); } catch (NoClassDefFoundError ncdfe) { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/DeploymentStrategy.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -98,12 +98,12 @@ Scanner scanner = instantiateScanner(className); if (scanner != null) { - log.debug("Using " + scanner.toString()); + log.trace("Using " + scanner.toString()); this.scanner = scanner; return; } } - log.debug("Using default URLScanner"); + log.trace("Using default URLScanner"); this.scanner = new URLScanner(this); } @@ -167,7 +167,7 @@ DeploymentHandler deploymentHandler = instantiateDeploymentHandler(className); if (deploymentHandler != null) { - log.debug("Adding " + deploymentHandler + " as a deployment handler"); + log.trace("Adding " + deploymentHandler + " as a deployment handler"); deploymentHandlers.put(deploymentHandler.getName(), deploymentHandler); } } Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/deployment/GroovyDeploymentHandler.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -121,10 +121,10 @@ log.debug("could not load groovy file: " + classname, ioe); } catch( CompilationFailedException e) { - log.info("Compilation error in Groovy file:" + classname, e); + log.debug("Compilation error in Groovy file:" + classname, e); } catch(GroovyRuntimeException e) { - log.info("Unknown error reading Groovy file:" + classname, e); + log.debug("Unknown error reading Groovy file:" + classname, e); } finally { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/drools/RuleBase.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/drools/RuleBase.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/drools/RuleBase.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -44,7 +44,7 @@ { for (String ruleFile: ruleFiles) { - log.info("parsing rules: " + ruleFile); + log.debug("parsing rules: " + ruleFile); InputStream stream = ResourceLoader.instance().getResourceAsStream(ruleFile); if (stream==null) { Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/init/Initialization.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/init/Initialization.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -691,7 +691,7 @@ public Initialization init() { - log.info("initializing Seam"); + log.debug("initializing Seam"); if (standardDeploymentStrategy == null) { throw new IllegalStateException("No deployment strategy!"); @@ -738,7 +738,7 @@ } ServletLifecycle.endInitialization(); - log.info("done initializing Seam"); + log.debug("done initializing Seam"); return this; } @@ -780,7 +780,7 @@ if (hotDeploymentStrategy.getTimestamp() > init.getTimestamp()) { - log.info("redeploying components"); + log.debug("redeploying components"); Seam.clearComponentNameCache(); for ( String name: init.getHotDeployableComponents() ) { @@ -800,7 +800,7 @@ init.getHotDeployableComponents().clear(); installHotDeployableComponents(); installComponents(init); - log.info("done redeploying components"); + log.debug("done redeploying components"); } // update the timestamp outside of the second timestamp check to be sure we don't cause an unnecessary scan // the second scan checks annotations (the slow part) which might happen to exclude the most recent file @@ -823,7 +823,7 @@ warRootDeploymentStrategy.scan(); if (warRootDeploymentStrategy.getTimestamp() > init.getWarTimestamp()) { - log.info("redeploying page descriptors..."); + log.debug("redeploying page descriptors..."); Pages pages = (Pages) ServletLifecycle.getServletContext().getAttribute(Seam.getComponentName(Pages.class)); if (pages != null) { // application context is needed for creating expressions @@ -833,7 +833,7 @@ } ServletLifecycle.getServletContext().removeAttribute(Seam.getComponentName(Exceptions.class)); init.setWarTimestamp(warRootDeploymentStrategy.getTimestamp()); - log.info("done redeploying page descriptors"); + log.debug ("done redeploying page descriptors"); } } } @@ -981,7 +981,7 @@ if (pkg != null) { Namespace ns = pkg.getAnnotation(Namespace.class); if (ns != null) { - log.info("Namespace: " + ns.value() + ", package: " + pkg.getName() + + log.debug("Namespace: " + ns.value() + ", package: " + pkg.getName() + ", prefix: " + ns.prefix()); NamespaceDescriptor descriptor = namespaceMap.get(ns.value()); @@ -1103,7 +1103,7 @@ private void installComponents(Init init) { - log.info("Installing components..."); + log.debug("Installing components..."); Context context = Contexts.getApplicationContext(); DependencyManager manager = new DependencyManager(componentDescriptors); Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/mail/MailSession.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/mail/MailSession.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/mail/MailSession.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -90,11 +90,11 @@ { if (getPort() != null) { - log.info("Creating JavaMail Session (" + getHost() + ':' + getPort() + ")"); + log.debug("Creating JavaMail Session (" + getHost() + ':' + getPort() + ")"); } else { - log.info("Creating JavaMail Session (" + getHost() + ")"); + log.debug("Creating JavaMail Session (" + getHost() + ")"); } Properties properties = new Properties(); @@ -179,7 +179,7 @@ session = javax.mail.Session.getInstance(properties, authenticator); session.setDebug(isDebug()); - log.info("connected to mail server"); + log.debug("connected to mail server"); } public String getPassword() Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -210,7 +210,7 @@ public DataSetOperation(String dataSetLocation, String dtdLocation, DatabaseOperation operation) { - log.info(">>> Preparing dataset: " + dataSetLocation + " <<<"); + log.debug(">>> Preparing dataset: " + dataSetLocation + " <<<"); // Load the base dataset file InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(dataSetLocation); Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/servlet/SeamListener.java =================================================================== --- branches/community/Seam_2_1/src/main/org/jboss/seam/servlet/SeamListener.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/main/org/jboss/seam/servlet/SeamListener.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -52,7 +52,7 @@ if (monitor != null && monitor.failover()) { // If application is unfarmed or all nodes shutdown simultaneously, cluster cache may still fail to retrieve SFSBs to destroy - log.info("Detected fail-over, not destroying session context"); + log.debug("Detected fail-over, not destroying session context"); } else { Modified: branches/community/Seam_2_1/src/wicket/org/jboss/seam/wicket/WicketComponent.java =================================================================== --- branches/community/Seam_2_1/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2009-05-07 01:56:53 UTC (rev 10823) +++ branches/community/Seam_2_1/src/wicket/org/jboss/seam/wicket/WicketComponent.java 2009-05-07 01:58:36 UTC (rev 10824) @@ -157,11 +157,11 @@ this.enclosingType = type.getEnclosingClass(); if (this.enclosingType != null) { - log.info("Class: " + type + ", enclosed by " + enclosingType); + log.debug("Class: " + type + ", enclosed by " + enclosingType); } else { - log.info("Class: " + type); + log.debug("Class: " + type); } scan();

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits May 2009