Seam SVN: r12470 - in modules/faces/trunk/examples/tiny-url: src/main/java/org/jboss/seam/faces/examples and 5 other directories.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-04-13 11:35:12 -0400 (Tue, 13 Apr 2010)
New Revision: 12470
Added:
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/LinkBean.java
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/RedirectBean.java
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/TinyLink.java
modules/faces/trunk/examples/tiny-url/src/main/resources/META-INF/
modules/faces/trunk/examples/tiny-url/src/main/resources/META-INF/persistence.xml
Removed:
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/LinkBean.java
modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/RedirectBean.java
Modified:
modules/faces/trunk/examples/tiny-url/pom.xml
modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/pretty-config.xml
modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/web.xml
modules/faces/trunk/examples/tiny-url/src/main/webapp/index.xhtml
Log:
Example is functional with MySQL -- needs to be switched back to Derby or embedded HSQLDB if possible.
Modified: modules/faces/trunk/examples/tiny-url/pom.xml
===================================================================
--- modules/faces/trunk/examples/tiny-url/pom.xml 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/pom.xml 2010-04-13 15:35:12 UTC (rev 12470)
@@ -19,18 +19,16 @@
</repository>
</repositories>
+ <properties>
+ <hibernate.version>3.5.0-Final</hibernate.version>
+ </properties>
+
<dependencies>
<dependency>
- <groupId>org.jboss.seam</groupId>
+ <groupId>org.jboss.seam.faces</groupId>
<artifactId>seam-faces</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.9.RC1</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>javax</groupId>
@@ -52,6 +50,28 @@
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
Deleted: modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/LinkBean.java
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/LinkBean.java 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/LinkBean.java 2010-04-13 15:35:12 UTC (rev 12470)
@@ -1,54 +0,0 @@
-/**
- *
- */
-package org.jboss.seam.faces.examples;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.ConversationScoped;
-import javax.inject.Named;
-
-import org.jboss.seam.faces.context.conversation.Begin;
-import org.jboss.seam.faces.context.conversation.End;
-
-/**
- * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- *
- */
-@Named
-@ConversationScoped
-public class LinkBean implements Serializable
-{
- private static final long serialVersionUID = -2209547152337410725L;
-
- private String key;
- private String url;
-
- @Begin
- @End
- public String createLink()
- {
- System.out.println("Created link: [ " + key + " => " + url + " ]");
- return "pretty:edit";
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey(final String key)
- {
- this.key = key;
- }
-
- public String getUrl()
- {
- return url;
- }
-
- public void setUrl(final String url)
- {
- this.url = url;
- }
-}
Deleted: modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/RedirectBean.java
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/RedirectBean.java 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/RedirectBean.java 2010-04-13 15:35:12 UTC (rev 12470)
@@ -1,45 +0,0 @@
-/**
- *
- */
-package org.jboss.seam.faces.examples;
-
-import java.io.IOException;
-
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
- *
- */
-@Named
-@RequestScoped
-public class RedirectBean
-{
- @Inject
- FacesContext context;
-
- private String key;
-
- public void send() throws IOException
- {
- String url = "http://ocpsoft.com";
- System.out.println("Sent redirect for key: " + key);
- HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
- response.sendRedirect(url);
- context.responseComplete();
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey(final String key)
- {
- this.key = key;
- }
-}
Copied: modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/LinkBean.java (from rev 12400, modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/LinkBean.java)
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/LinkBean.java (rev 0)
+++ modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/LinkBean.java 2010-04-13 15:35:12 UTC (rev 12470)
@@ -0,0 +1,98 @@
+/**
+ *
+ */
+package org.jboss.seam.faces.examples.tinyurl;
+
+import java.io.Serializable;
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateful;
+import javax.enterprise.context.ConversationScoped;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.sql.DataSource;
+
+import org.jboss.seam.faces.context.conversation.Begin;
+import org.jboss.seam.faces.context.conversation.End;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+@Named
+@ConversationScoped
+@Stateful
+public class LinkBean implements Serializable
+{
+ private static final long serialVersionUID = -2209547152337410725L;
+
+ @PersistenceContext
+ private EntityManager em;
+
+ @Resource(name = "java:app/Application_Level_DataSource")
+ private DataSource ds;
+
+ private TinyLink link = new TinyLink();
+
+ @Begin
+ @End
+ public String createLink() throws SQLException
+ {
+ System.out.println("Created link: [ " + link.getName() + " => " + link.getTarget() + " ]");
+ em.persist(link);
+ // ds.getConnection();
+ return "pretty:create";
+ }
+
+ @SuppressWarnings("unchecked")
+ public TinyLink getByKey(final String key)
+ {
+ Query query = em.createQuery("from TinyLink t where t.name=:key", TinyLink.class);
+ query.setParameter("key", key);
+ List<TinyLink> resultList = query.getResultList();
+ if (resultList.isEmpty())
+ {
+ return new TinyLink();
+ }
+ return resultList.get(0);
+ }
+
+ public String format(final String link)
+ {
+ if (link != null)
+ {
+ String result = link.trim();
+ if (!result.matches("(http|ftp)://.*"))
+ {
+ result = "http://" + result;
+ }
+ return result;
+ }
+ return "";
+ }
+
+ public String deleteAll()
+ {
+ em.createQuery("delete from TinyLink").executeUpdate();
+ return "pretty:";
+ }
+
+ public List<TinyLink> getLinks()
+ {
+ return em.createQuery("from TinyLink").getResultList();
+ }
+
+ public TinyLink getLink()
+ {
+ return link;
+ }
+
+ public void setLink(final TinyLink link)
+ {
+ this.link = link;
+ }
+}
Copied: modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/RedirectBean.java (from rev 12400, modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/RedirectBean.java)
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/RedirectBean.java (rev 0)
+++ modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/RedirectBean.java 2010-04-13 15:35:12 UTC (rev 12470)
@@ -0,0 +1,48 @@
+/**
+ *
+ */
+package org.jboss.seam.faces.examples.tinyurl;
+
+import java.io.IOException;
+
+import javax.enterprise.context.RequestScoped;
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ *
+ */
+@Named
+@RequestScoped
+public class RedirectBean
+{
+ @Inject
+ FacesContext context;
+
+ @Inject
+ LinkBean linkBean;
+
+ private String name;
+
+ public void send() throws IOException
+ {
+ String url = linkBean.getByKey(name).getTarget();
+ System.out.println("Sent redirect for key: " + name + " => " + url);
+ HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
+ response.sendRedirect(linkBean.format(url));
+ context.responseComplete();
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(final String key)
+ {
+ this.name = key;
+ }
+}
Added: modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/TinyLink.java
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/TinyLink.java (rev 0)
+++ modules/faces/trunk/examples/tiny-url/src/main/java/org/jboss/seam/faces/examples/tinyurl/TinyLink.java 2010-04-13 15:35:12 UTC (rev 12470)
@@ -0,0 +1,136 @@
+/**
+ *
+ */
+package org.jboss.seam.faces.examples.tinyurl;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.validation.constraints.Pattern;
+
+/**
+ * Represents a mapping between a Tiny URL and its destination URL.
+ *
+ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
+ */
+@Entity
+public class TinyLink
+{
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ private Long id;
+
+ @Column(unique = true, updatable = false)
+ private String uid;
+
+ @Column(unique = true, updatable = false)
+ private String name;
+
+ @Pattern(regexp = "((http|ftp)://)?(www.)?((\\w+\\.)+(\\w+)(/.*)?)", message = "Must be a valid web address")
+ private String target;
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(final Long id)
+ {
+ this.id = id;
+ }
+
+ public String getUid()
+ {
+ return uid;
+ }
+
+ public void setUid(final String key)
+ {
+ this.uid = key;
+ }
+
+ public String getTarget()
+ {
+ return target;
+ }
+
+ public void setTarget(final String target)
+ {
+ this.target = target;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((uid == null) ? 0 : uid.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ TinyLink other = (TinyLink) obj;
+ if (id == null)
+ {
+ if (other.id != null)
+ {
+ return false;
+ }
+ }
+ else if (!id.equals(other.id))
+ {
+ return false;
+ }
+ if (uid == null)
+ {
+ if (other.uid != null)
+ {
+ return false;
+ }
+ }
+ else if (!uid.equals(other.uid))
+ {
+ return false;
+ }
+ if (name == null)
+ {
+ if (other.name != null)
+ {
+ return false;
+ }
+ }
+ else if (!name.equals(other.name))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+}
Added: modules/faces/trunk/examples/tiny-url/src/main/resources/META-INF/persistence.xml
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/resources/META-INF/persistence.xml (rev 0)
+++ modules/faces/trunk/examples/tiny-url/src/main/resources/META-INF/persistence.xml 2010-04-13 15:35:12 UTC (rev 12470)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+ <persistence-unit name="example" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source> jdbc/mysql </jta-data-source>
+ <!--
+ <jta-data-source> jdbc/__default </jta-data-source>
+ <jta-data-source> java:app/Application_Level_DataSource </jta-data-source>
+ -->
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/>
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Modified: modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/pretty-config.xml
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/pretty-config.xml 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/pretty-config.xml 2010-04-13 15:35:12 UTC (rev 12470)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://ocpsoft.com/prettyfaces/2.0.4
http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-2.0.4.xsd">
- <rewrite trailingSlash="remove" toCase="lowercase" />
+ <rewrite match="^/.+$" trailingSlash="remove" toCase="lowercase" />
<url-mapping id="create">
<pattern value="/" />
@@ -11,13 +11,13 @@
</url-mapping>
<url-mapping id="redirect">
- <pattern value="/#{key}" />
+ <pattern value="/#{name}" />
<view-id>/faces/index.xhtml</view-id>
<action phaseId="RENDER_RESPONSE">#{redirectBean.send}</action>
</url-mapping>
<url-mapping id="edit">
- <pattern value="/#{key}/edit" />
+ <pattern value="/#{name}/edit" />
<view-id>/faces/editLink.xhtml</view-id>
<action phaseId="INVOKE_APPLICATION">#{linkBean.send}</action>
</url-mapping>
Modified: modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/web.xml 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/src/main/webapp/WEB-INF/web.xml 2010-04-13 15:35:12 UTC (rev 12470)
@@ -1,24 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>faces/index.xhtml</welcome-file>
- </welcome-file-list>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <data-source>
+ <name>java:app/Application_Level_DataSource</name>
+ <class-name>org.hsqldb.jdbc.jdbcDataSource</class-name>
+ <url>jdbc:hsqldb:file:aname</url>
+ <user>sa</user>
+ <password>sa</password>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.HSQLDialect</value>
+ </property>
+ </data-source>
+ <data-source>
+ <name>java:app/mysql</name>
+ <class-name>org.hsqldb.jdbc.jdbcDataSource</class-name>
+ <url>jdbc:hsqldb:file:aname</url>
+ <user>sa</user>
+ <password>sa</password>
+ <property>
+ <name>hibernate.dialect</name>
+ <value>org.hibernate.dialect.HSQLDialect</value>
+ </property>
+ </data-source>
+
+
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>faces/index.xhtml</welcome-file>
+ </welcome-file-list>
</web-app>
Modified: modules/faces/trunk/examples/tiny-url/src/main/webapp/index.xhtml
===================================================================
--- modules/faces/trunk/examples/tiny-url/src/main/webapp/index.xhtml 2010-04-13 14:34:43 UTC (rev 12469)
+++ modules/faces/trunk/examples/tiny-url/src/main/webapp/index.xhtml 2010-04-13 15:35:12 UTC (rev 12470)
@@ -1,27 +1,45 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
- <f:metadata>
- <f:viewParam name="key" value="#{redirectBean.key}" />
- </f:metadata>
+<f:metadata>
+ <f:viewParam name="name" value="#{redirectBean.name}" />
+</f:metadata>
- <h:head>
- </h:head>
+<h:head>
+</h:head>
- <h:body>
- <h:form>
+<h:body>
+ <h:form>
+ <fieldset><f:validateBean>
<h3>Create a new link:</h3>
- <label for="key">Key: <h:messages for="key"/><br/></label>
- <h:inputText id="key" value="#{createLinkBean.key}" /><br/>
- <label for="url">Link URL: <h:messages for="url"/><br/></label>
- <h:inputText id="url" value="#{createLinkBean.url}" /><br/>
- <h:commandButton action ="#{createLinkBean.createLink}" value="Create" />
- </h:form>
- </h:body>
+ <label for="url">Link URL: <h:messages for="url" /><br />
+ </label>
+ <h:inputText id="url" value="#{linkBean.link.target}" />
+ <br />
+ <label for="name">Name (optional): <h:messages for="name" /><br />
+ </label>
+ <h:inputText id="name" value="#{linkBean.link.name}" />
+ <br />
+ </f:validateBean></fieldset>
+ <h:commandButton action="#{linkBean.createLink}" value="Create" />
+ <br />
+ <ui:repeat value="#{linkBean.links}" var="link">
+ #{link.id} -
+ <h:link outcome="/index" value="#{link.name}">
+ <f:param name="name" value="#{link.name}" />
+ </h:link>
+ <br />
+ </ui:repeat>
+
+ <h:commandButton action="#{linkBean.deleteAll}" value="deleteAll"
+ immediate="true" rendered="#{!linkBean.links.isEmpty()}" />
+ </h:form>
+</h:body>
+
</html>
16 years
Seam SVN: r12469 - branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-04-13 10:34:43 -0400 (Tue, 13 Apr 2010)
New Revision: 12469
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
Log:
minor
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:34:00 UTC (rev 12468)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:34:43 UTC (rev 12469)
@@ -63,7 +63,7 @@
{
seamGen.addIdentityManagement();
seamGen.restart();
- waitForAppToDeploy(HOME_PAGE, FOOTER);
+ waitForAppToDeploy(HOME_PAGE, IDENTITY_MANAGEMENT);
// execute testing import script
InputStream is = getClass().getResourceAsStream("/org/jboss/seam/test/functional/seamgen/identity-management.sql");
16 years
Seam SVN: r12468 - in branches/enterprise/JBPAPP_5_0: src/test/ftest and 2 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-04-13 10:34:00 -0400 (Tue, 13 Apr 2010)
New Revision: 12468
Added:
branches/enterprise/JBPAPP_5_0/.project
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
Log:
revert 12465
Added: branches/enterprise/JBPAPP_5_0/.project
===================================================================
--- branches/enterprise/JBPAPP_5_0/.project (rev 0)
+++ branches/enterprise/JBPAPP_5_0/.project 2010-04-13 14:34:00 UTC (rev 12468)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-seam</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.seam.core.seamnature</nature>
+ </natures>
+</projectDescription>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2010-04-13 14:27:22 UTC (rev 12467)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2010-04-13 14:34:00 UTC (rev 12468)
@@ -25,7 +25,7 @@
# Selenium testng specific
selenium.server.port=14444
selenium.host=localhost
-selenium.browser=*firefox /usr/lib64/firefox-3.5.8/firefox
+selenium.browser=*firefoxproxy
#selenium.browser=*iexploreproxy
selenium.browser.port=8080
selenium.browser.url=http://127.0.0.1:8080
@@ -50,11 +50,11 @@
# container locations - must be set
# independent from ${seam.dir}/build.properties
-jboss5.home=/home/jharting/jboss/testing/EAP-5.0.1.CR2/jboss-eap-5.0/jboss-as
+jboss5.home=/home/mnovotny/apps/jboss-eap-5.0/jboss-as
# container settings
jboss5.profile=default
-jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true
+jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true"
run.container.per.suite=true
jboss.deployments.restart=10
@@ -71,28 +71,29 @@
# If set to true, the container is launched automatically prior to testsuite execution and shut down after it finishes
# The container has to be run manually otherwise
-#seamgen.control.container=false
+seamgen.control.container=false
# workspace for new projects
-workspace.home=/home/jharting/temp/2
+workspace.home=/home/mnovotny/tmp
# seam-gen project properties
database.type=mysql
database.exists=y
database.drop=n
-driver.jar=/home/jharting/jboss/mysql-connector-java-5.1.11-bin.jar
+driver.jar=/usr/share/java/mysql.jar
driver.license.jar=
-hibernate.connection.username=seamgen
-hibernate.connection.password=seamgen
+hibernate.connection.username=seam
+hibernate.connection.password=seam
hibernate.connection.driver_class=com.mysql.jdbc.Driver
hibernate.connection.dataSource_class=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
hibernate.default_catalog.null=
hibernate.default_schema.null=
hibernate.dialect=org.hibernate.dialect.MySQLDialect
-hibernate.connection.url=jdbc\:mysql\:///seam
+hibernate.connection.url=jdbc\:mysql\:///seamdb
model.package=com.example
action.package=com.example
test.package=com.example.test
richfaces.skin=classic
+jboss.domain=default
# ant.exec=/usr/bin/ant
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2010-04-13 14:27:22 UTC (rev 12467)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2010-04-13 14:34:00 UTC (rev 12468)
@@ -121,7 +121,6 @@
<macrodef name="run.selenium.test">
<attribute name="suite" />
<sequential>
- <ant target="start.container"/>
<!--<ant antfile="${seam.dir}/build.xml" target="copyseam"/>
<ant antfile="${seam.dir}/build.xml" target="copyseamdependencies"/>-->
<taskdef resource="testngtasks" classpathref="classpath.test" />
@@ -131,21 +130,7 @@
<sysproperty key="seam.dir" value="${seam.dir}" />
<sysproperty key="ftest.config.location" value="${ftest.config.location}" />
</testng>
- <ant target="stop.container"/>
</sequential>
</macrodef>
-
- <target name="start.container" if="run.container.per.suite">
- <echo>Starting container</echo>
- <ant antfile="${ftest.dir}/examples/build.xml" target="start.container.jboss" inheritall="false">
- <property name="container" value="${container}" />
- </ant>
- </target>
- <target name="stop.container" if="run.container.per.suite">
- <echo>Stopping container</echo>
- <ant antfile="${ftest.dir}/examples/build.xml" target="stop.container.jboss" inheritall="false">
- <property name="container" value="${container}" />
- </ant>
- </target>
</project>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:27:22 UTC (rev 12467)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:34:00 UTC (rev 12468)
@@ -63,7 +63,7 @@
{
seamGen.addIdentityManagement();
seamGen.restart();
- waitForAppToDeploy(HOME_PAGE, IDENTITY_MANAGEMENT);
+ waitForAppToDeploy(HOME_PAGE, FOOTER);
// execute testing import script
InputStream is = getClass().getResourceAsStream("/org/jboss/seam/test/functional/seamgen/identity-management.sql");
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2010-04-13 14:27:22 UTC (rev 12467)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2010-04-13 14:34:00 UTC (rev 12468)
@@ -130,35 +130,22 @@
public void waitForAppToDeploy(String url, String element)
{
int step = 5000;
- int remainingTime = DEPLOY_TIMEOUT;
- /*
- * When using restart(), the application might be still available (not undeployed yet) when this method
- * is executed, which result in a premature finish of this wait method. As a result,
- * a next test method fails since the application is in the middle of deployment.
- * Therefore, we need to make sure we do not hit the "pre redeploy" state. We do this by requiring
- * several successful page hits separated by 5 seconds.
- */
- int successes = 0;
- int requiredSuccesses = 4;
+ int i = DEPLOY_TIMEOUT;
SeamSelenium browser = startBrowser();
browser.open(url);
try
{
- while (successes < requiredSuccesses)
+ while (!browser.isElementPresent(element))
{
- remainingTime -= step;
- if (remainingTime <= 0)
+ i -= step;
+ if (i <= 0)
{
throw new RuntimeException("Timeout waiting for " + element + " at " + url);
}
Thread.sleep(step);
browser.open(url); // try again
- if (browser.isElementPresent(element))
- {
- successes++;
- }
}
}
catch (InterruptedException ie)
16 years
Seam SVN: r12467 - branches/enterprise/JBPAPP_5_0.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-04-13 10:27:22 -0400 (Tue, 13 Apr 2010)
New Revision: 12467
Removed:
branches/enterprise/JBPAPP_5_0/.project
Log:
revert 12465
Deleted: branches/enterprise/JBPAPP_5_0/.project
===================================================================
--- branches/enterprise/JBPAPP_5_0/.project 2010-04-13 14:20:15 UTC (rev 12466)
+++ branches/enterprise/JBPAPP_5_0/.project 2010-04-13 14:27:22 UTC (rev 12467)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Seam_EAP5</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.jboss.tools.seam.core.seamnature</nature>
- </natures>
-</projectDescription>
16 years
Seam SVN: r12466 - branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-04-13 10:20:15 -0400 (Tue, 13 Apr 2010)
New Revision: 12466
Modified:
branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:19:58 UTC (rev 12465)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:20:15 UTC (rev 12466)
@@ -63,7 +63,7 @@
{
seamGen.addIdentityManagement();
seamGen.restart();
- waitForAppToDeploy(HOME_PAGE, FOOTER);
+ waitForAppToDeploy(HOME_PAGE, IDENTITY_MANAGEMENT);
// execute testing import script
InputStream is = getClass().getResourceAsStream("/org/jboss/seam/test/functional/seamgen/identity-management.sql");
16 years
Seam SVN: r12465 - in branches/enterprise/JBPAPP_5_0: src/test/ftest and 2 other directories.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-04-13 10:19:58 -0400 (Tue, 13 Apr 2010)
New Revision: 12465
Modified:
branches/enterprise/JBPAPP_5_0/.project
branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
Log:
minor
Modified: branches/enterprise/JBPAPP_5_0/.project
===================================================================
--- branches/enterprise/JBPAPP_5_0/.project 2010-04-13 12:23:07 UTC (rev 12464)
+++ branches/enterprise/JBPAPP_5_0/.project 2010-04-13 14:19:58 UTC (rev 12465)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-seam</name>
+ <name>Seam_EAP5</name>
<comment></comment>
<projects>
</projects>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2010-04-13 12:23:07 UTC (rev 12464)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2010-04-13 14:19:58 UTC (rev 12465)
@@ -25,7 +25,7 @@
# Selenium testng specific
selenium.server.port=14444
selenium.host=localhost
-selenium.browser=*firefoxproxy
+selenium.browser=*firefox /usr/lib64/firefox-3.5.8/firefox
#selenium.browser=*iexploreproxy
selenium.browser.port=8080
selenium.browser.url=http://127.0.0.1:8080
@@ -50,11 +50,11 @@
# container locations - must be set
# independent from ${seam.dir}/build.properties
-jboss5.home=/home/mnovotny/apps/jboss-eap-5.0/jboss-as
+jboss5.home=/home/jharting/jboss/testing/EAP-5.0.1.CR2/jboss-eap-5.0/jboss-as
# container settings
jboss5.profile=default
-jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true"
+jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true
run.container.per.suite=true
jboss.deployments.restart=10
@@ -71,29 +71,28 @@
# If set to true, the container is launched automatically prior to testsuite execution and shut down after it finishes
# The container has to be run manually otherwise
-seamgen.control.container=false
+#seamgen.control.container=false
# workspace for new projects
-workspace.home=/home/mnovotny/tmp
+workspace.home=/home/jharting/temp/2
# seam-gen project properties
database.type=mysql
database.exists=y
database.drop=n
-driver.jar=/usr/share/java/mysql.jar
+driver.jar=/home/jharting/jboss/mysql-connector-java-5.1.11-bin.jar
driver.license.jar=
-hibernate.connection.username=seam
-hibernate.connection.password=seam
+hibernate.connection.username=seamgen
+hibernate.connection.password=seamgen
hibernate.connection.driver_class=com.mysql.jdbc.Driver
hibernate.connection.dataSource_class=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
hibernate.default_catalog.null=
hibernate.default_schema.null=
hibernate.dialect=org.hibernate.dialect.MySQLDialect
-hibernate.connection.url=jdbc\:mysql\:///seamdb
+hibernate.connection.url=jdbc\:mysql\:///seam
model.package=com.example
action.package=com.example
test.package=com.example.test
richfaces.skin=classic
-jboss.domain=default
# ant.exec=/usr/bin/ant
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2010-04-13 12:23:07 UTC (rev 12464)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2010-04-13 14:19:58 UTC (rev 12465)
@@ -121,6 +121,7 @@
<macrodef name="run.selenium.test">
<attribute name="suite" />
<sequential>
+ <ant target="start.container"/>
<!--<ant antfile="${seam.dir}/build.xml" target="copyseam"/>
<ant antfile="${seam.dir}/build.xml" target="copyseamdependencies"/>-->
<taskdef resource="testngtasks" classpathref="classpath.test" />
@@ -130,7 +131,21 @@
<sysproperty key="seam.dir" value="${seam.dir}" />
<sysproperty key="ftest.config.location" value="${ftest.config.location}" />
</testng>
+ <ant target="stop.container"/>
</sequential>
</macrodef>
+
+ <target name="start.container" if="run.container.per.suite">
+ <echo>Starting container</echo>
+ <ant antfile="${ftest.dir}/examples/build.xml" target="start.container.jboss" inheritall="false">
+ <property name="container" value="${container}" />
+ </ant>
+ </target>
+ <target name="stop.container" if="run.container.per.suite">
+ <echo>Stopping container</echo>
+ <ant antfile="${ftest.dir}/examples/build.xml" target="stop.container.jboss" inheritall="false">
+ <property name="container" value="${container}" />
+ </ant>
+ </target>
</project>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 12:23:07 UTC (rev 12464)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/IdentityManagementTest.java 2010-04-13 14:19:58 UTC (rev 12465)
@@ -63,7 +63,7 @@
{
seamGen.addIdentityManagement();
seamGen.restart();
- waitForAppToDeploy(HOME_PAGE, FOOTER);
+ waitForAppToDeploy(HOME_PAGE, IDENTITY_MANAGEMENT);
// execute testing import script
InputStream is = getClass().getResourceAsStream("/org/jboss/seam/test/functional/seamgen/identity-management.sql");
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2010-04-13 12:23:07 UTC (rev 12464)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeleniumSeamGenTest.java 2010-04-13 14:19:58 UTC (rev 12465)
@@ -130,22 +130,35 @@
public void waitForAppToDeploy(String url, String element)
{
int step = 5000;
- int i = DEPLOY_TIMEOUT;
+ int remainingTime = DEPLOY_TIMEOUT;
+ /*
+ * When using restart(), the application might be still available (not undeployed yet) when this method
+ * is executed, which result in a premature finish of this wait method. As a result,
+ * a next test method fails since the application is in the middle of deployment.
+ * Therefore, we need to make sure we do not hit the "pre redeploy" state. We do this by requiring
+ * several successful page hits separated by 5 seconds.
+ */
+ int successes = 0;
+ int requiredSuccesses = 4;
SeamSelenium browser = startBrowser();
browser.open(url);
try
{
- while (!browser.isElementPresent(element))
+ while (successes < requiredSuccesses)
{
- i -= step;
- if (i <= 0)
+ remainingTime -= step;
+ if (remainingTime <= 0)
{
throw new RuntimeException("Timeout waiting for " + element + " at " + url);
}
Thread.sleep(step);
browser.open(url); // try again
+ if (browser.isElementPresent(element))
+ {
+ successes++;
+ }
}
}
catch (InterruptedException ie)
16 years
Seam SVN: r12464 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security: permission and 1 other directory.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-13 08:23:07 -0400 (Tue, 13 Apr 2010)
New Revision: 12464
Added:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java
Removed:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
Log:
split stuff into api/impl
Deleted: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,103 +0,0 @@
-package org.jboss.seam.security;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.jboss.seam.security.events.CredentialsInitializedEvent;
-import org.jboss.seam.security.events.CredentialsUpdatedEvent;
-
-@Named//("org.jboss.seam.security.credentials")
-@SessionScoped
-public class Credentials implements Serializable
-{
- private static final long serialVersionUID = -2271248957776488426L;
-
- @Inject BeanManager manager;
-
- private String username;
- private String password;
-
- private boolean invalid;
-
- private boolean initialized;
-
- public Credentials() {}
-
- public boolean isInitialized()
- {
- return initialized;
- }
-
- public void setInitialized(boolean initialized)
- {
- this.initialized = initialized;
- }
-
- public String getUsername()
- {
- if (!isInitialized())
- {
- setInitialized(true);
- manager.fireEvent(new CredentialsInitializedEvent(this));
- }
-
- return username;
- }
-
- public void setUsername(String username)
- {
- if (this.username != username && (this.username == null || !this.username.equals(username)))
- {
- this.username = username;
- invalid = false;
- manager.fireEvent(new CredentialsUpdatedEvent());
- }
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setPassword(String password)
- {
- if (this.password != password && (this.password == null || !this.password.equals(password)))
- {
- this.password = password;
- invalid = false;
- manager.fireEvent(new CredentialsUpdatedEvent());
- }
- }
-
- public boolean isSet()
- {
- return getUsername() != null && password != null;
- }
-
- public boolean isInvalid()
- {
- return invalid;
- }
-
- public void invalidate()
- {
- invalid = true;
- }
-
- public void clear()
- {
- username = null;
- password = null;
- initialized = false;
- }
-
- @Override
- public String toString()
- {
- return "Credentials[" + username + "]";
- }
-}
Copied: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java (from rev 12453, modules/security/trunk/impl/src/main/java/org/jboss/seam/security/Credentials.java)
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java (rev 0)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/CredentialsImpl.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -0,0 +1,103 @@
+package org.jboss.seam.security;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.seam.security.events.CredentialsInitializedEvent;
+import org.jboss.seam.security.events.CredentialsUpdatedEvent;
+
+@Named//("org.jboss.seam.security.credentials")
+@SessionScoped
+public class CredentialsImpl implements Credentials, Serializable
+{
+ private static final long serialVersionUID = -2271248957776488426L;
+
+ @Inject BeanManager manager;
+
+ private String username;
+ private String password;
+
+ private boolean invalid;
+
+ private boolean initialized;
+
+ public CredentialsImpl() {}
+
+ public boolean isInitialized()
+ {
+ return initialized;
+ }
+
+ public void setInitialized(boolean initialized)
+ {
+ this.initialized = initialized;
+ }
+
+ public String getUsername()
+ {
+ if (!isInitialized())
+ {
+ setInitialized(true);
+ manager.fireEvent(new CredentialsInitializedEvent(this));
+ }
+
+ return username;
+ }
+
+ public void setUsername(String username)
+ {
+ if (this.username != username && (this.username == null || !this.username.equals(username)))
+ {
+ this.username = username;
+ invalid = false;
+ manager.fireEvent(new CredentialsUpdatedEvent());
+ }
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ if (this.password != password && (this.password == null || !this.password.equals(password)))
+ {
+ this.password = password;
+ invalid = false;
+ manager.fireEvent(new CredentialsUpdatedEvent());
+ }
+ }
+
+ public boolean isSet()
+ {
+ return getUsername() != null && password != null;
+ }
+
+ public boolean isInvalid()
+ {
+ return invalid;
+ }
+
+ public void invalidate()
+ {
+ invalid = true;
+ }
+
+ public void clear()
+ {
+ username = null;
+ password = null;
+ initialized = false;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Credentials[" + username + "]";
+ }
+}
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -63,7 +63,7 @@
Logger log = LoggerFactory.getLogger(Identity.class);
@Inject private BeanManager manager;
- @Inject private Credentials credentials;
+ @Inject private CredentialsImpl credentials;
@Inject private PermissionMapper permissionMapper;
@Inject private IdentityManager identityManager;
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/RememberMe.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -38,7 +38,7 @@
@Inject BeanManager manager;
@Inject Identity identity;
@Inject IdentityImpl identityImpl;
- @Inject Credentials credentials;
+ @Inject CredentialsImpl credentials;
@Inject IdentityManager identityManager;
// Heaps of stuff commented out here because we need to add generic cookie support
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -33,7 +33,7 @@
private static final String DEFAULT_NOT_LOGGED_IN_MESSAGE = "Please log in first.";
//@Inject StatusMessages statusMessages;
- @Inject Credentials credentials;
+ @Inject CredentialsImpl credentials;
public void postAuthenticate(@Observes PostAuthenticateEvent event)
{
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -14,20 +14,12 @@
{
private Object target;
- @Deprecated
- private String name;
-
private String action;
private boolean granted;
private Set<String> requirements;
public PermissionCheck(Object target, String action)
- {
- if (target instanceof String)
- {
- this.name = (String) target;
- }
-
+ {
this.target = target;
this.action = action;
granted = false;
@@ -38,12 +30,6 @@
return target;
}
- @Deprecated
- public String getName()
- {
- return name;
- }
-
public String getAction()
{
return action;
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,19 +1,21 @@
package org.jboss.seam.security.permission;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import org.jboss.seam.security.events.DefaultResolverChainCreatedEvent;
-
/**
* Maps permission checks to resolver chains
*
@@ -32,7 +34,7 @@
@Inject BeanManager manager;
- private ResolverChain getResolverChain(Object target, String action)
+ private List<PermissionResolver> getResolvers(Object target, String action)
{
Class<?> targetClass = null;
@@ -69,8 +71,8 @@
public boolean resolvePermission(Object target, String action)
{
- ResolverChain chain = getResolverChain(target, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(target, action);
+ for (PermissionResolver resolver : resolvers)
{
if (resolver.hasPermission(target, action))
{
@@ -99,8 +101,8 @@
if (homogenous)
{
Set<Object> denied = new HashSet<Object>(collection);
- ResolverChain chain = getResolverChain(targetClass, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(targetClass, action);
+ for (PermissionResolver resolver : resolvers)
{
resolver.filterSetByAction(denied, action);
}
@@ -130,8 +132,8 @@
for (Class cls : deniedByClass.keySet())
{
Set<Object> denied = deniedByClass.get(cls);
- ResolverChain chain = getResolverChain(cls, action);
- for (PermissionResolver resolver : chain.getResolvers())
+ List<PermissionResolver> resolvers = getResolvers(cls, action);
+ for (PermissionResolver resolver : resolvers)
{
resolver.filterSetByAction(denied, action);
}
@@ -144,27 +146,16 @@
}
}
- private ResolverChain createDefaultResolverChain()
+ @Produces public @SessionScoped List<PermissionResolver> createDefaultResolverChain()
{
- // TODO fix
- ResolverChain chain = null; //(ResolverChain) Contexts.getSessionContext().get(DEFAULT_RESOLVER_CHAIN);
-
- if (chain == null)
+ List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();
+
+ Set<Bean<?>> beans = manager.getBeans(PermissionResolver.class);
+ for (Bean<?> resolverBean : beans)
{
- chain = new ResolverChain();
-
- Set<Bean<?>> resolvers = manager.getBeans(PermissionResolver.class);
- for (Bean<?> resolverBean : resolvers)
- {
- chain.getResolvers().add((PermissionResolver) manager.getReference(resolverBean, PermissionResolver.class, manager.createCreationalContext(resolverBean)));
- }
-
- // TODO fix
- // Contexts.getSessionContext().set(DEFAULT_RESOLVER_CHAIN, chain);
-
- manager.fireEvent(new DefaultResolverChainCreatedEvent(chain));
+ resolvers.add((PermissionResolver) manager.getReference(resolverBean, PermissionResolver.class, manager.createCreationalContext(resolverBean)));
}
- return chain;
+ return resolvers;
}
}
Deleted: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java 2010-04-13 12:05:04 UTC (rev 12463)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/ResolverChain.java 2010-04-13 12:23:07 UTC (rev 12464)
@@ -1,31 +0,0 @@
-package org.jboss.seam.security.permission;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.enterprise.context.SessionScoped;
-
-/**
- * A chain of permission resolvers. Specific permission checks are generally mapped to a
- * particular ResolverChain for resolution.
- *
- * @author Shane Bryzak
- */
-@SessionScoped
-public class ResolverChain implements Serializable
-{
- private static final long serialVersionUID = 4395507285094476740L;
-
- private List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();
-
- public List<PermissionResolver> getResolvers()
- {
- return resolvers;
- }
-
- public void setResolvers(List<PermissionResolver> resolvers)
- {
- this.resolvers = resolvers;
- }
-}
16 years
Seam SVN: r12463 - in modules/security/trunk/api/src/main/java/org/jboss/seam/security: events and 1 other directory.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-13 08:05:04 -0400 (Tue, 13 Apr 2010)
New Revision: 12463
Added:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/Credentials.java
Removed:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java
Log:
removed DefaultResolverChainCreatedEvent, split Credentials into api/impl
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/Credentials.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/Credentials.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/Credentials.java 2010-04-13 12:05:04 UTC (rev 12463)
@@ -0,0 +1,27 @@
+package org.jboss.seam.security;
+
+/**
+ * Represents the credentials the current user will use to authenticate
+ *
+ * @author Shane Bryzak
+ *
+ */
+public interface Credentials
+{
+ String getUsername();
+
+ void setUsername(String username);
+
+ String getPassword();
+
+ void setPassword(String password);
+
+ boolean isSet();
+
+ boolean isInvalid();
+
+ void invalidate();
+
+ void clear();
+
+}
Deleted: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java 2010-04-13 11:45:22 UTC (rev 12462)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java 2010-04-13 12:05:04 UTC (rev 12463)
@@ -1,23 +0,0 @@
-package org.jboss.seam.security.events;
-
-import org.jboss.seam.security.permission.ResolverChain;
-
-/**
- * This event is raised when the default permission resolver chain is created
- *
- * @author Shane Bryzak
- */
-public class DefaultResolverChainCreatedEvent
-{
- private ResolverChain chain;
-
- public DefaultResolverChainCreatedEvent(ResolverChain chain)
- {
- this.chain = chain;
- }
-
- public ResolverChain getChain()
- {
- return chain;
- }
-}
16 years
Seam SVN: r12462 - in modules/security/trunk: api/src/main/java/org/jboss/seam/security/permission and 1 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-13 07:45:22 -0400 (Tue, 13 Apr 2010)
New Revision: 12462
Added:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/permission/
modules/security/trunk/api/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
Removed:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
Log:
move IdentifierStrategy to API
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java 2010-04-13 11:45:22 UTC (rev 12462)
@@ -0,0 +1,12 @@
+package org.jboss.seam.security.permission;
+
+/**
+ * Strategy for generating permission target identifiers.
+ *
+ * @author Shane Bryzak
+ */
+public interface IdentifierStrategy
+{
+ boolean canIdentify(Class targetClass);
+ String getIdentifier(Object target);
+}
Deleted: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java 2010-04-13 11:41:28 UTC (rev 12461)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java 2010-04-13 11:45:22 UTC (rev 12462)
@@ -1,12 +0,0 @@
-package org.jboss.seam.security.permission;
-
-/**
- * Strategy for generating permission target identifiers.
- *
- * @author Shane Bryzak
- */
-public interface IdentifierStrategy
-{
- boolean canIdentify(Class targetClass);
- String getIdentifier(Object target);
-}
16 years
Seam SVN: r12461 - modules/security/trunk/api/src/main/java/org/jboss/seam/security/events.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-13 07:41:28 -0400 (Tue, 13 Apr 2010)
New Revision: 12461
Added:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/AlreadyLoggedInEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsInitializedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsUpdatedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedInEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoginFailedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotAuthorizedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotLoggedInEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostAuthenticateEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreAuthenticateEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserRoleEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/QuietLoginEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserAuthenticatedEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserCreatedEvent.java
Log:
move events to api
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/AlreadyLoggedInEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/AlreadyLoggedInEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/AlreadyLoggedInEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is fired when an already authenticated user attempts to authenticate again
+ *
+ * @author Shane Bryzak
+ */
+public class AlreadyLoggedInEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsInitializedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsInitializedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsInitializedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,28 @@
+package org.jboss.seam.security.events;
+
+import org.jboss.seam.security.Credentials;
+
+/**
+ * This event is raised when credentials are initialized
+ *
+ * @author Shane Bryzak
+ */
+public class CredentialsInitializedEvent
+{
+ private Credentials credentials;
+
+ public CredentialsInitializedEvent(Credentials credentials)
+ {
+ this.credentials = credentials;
+ }
+
+ public Credentials getCredentials()
+ {
+ return credentials;
+ }
+
+ public void setCredentials(Credentials credentials)
+ {
+ this.credentials = credentials;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsUpdatedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsUpdatedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/CredentialsUpdatedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised when credentials are updated
+ *
+ * @author Shane Bryzak
+ */
+public class CredentialsUpdatedEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/DefaultResolverChainCreatedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,23 @@
+package org.jboss.seam.security.events;
+
+import org.jboss.seam.security.permission.ResolverChain;
+
+/**
+ * This event is raised when the default permission resolver chain is created
+ *
+ * @author Shane Bryzak
+ */
+public class DefaultResolverChainCreatedEvent
+{
+ private ResolverChain chain;
+
+ public DefaultResolverChainCreatedEvent(ResolverChain chain)
+ {
+ this.chain = chain;
+ }
+
+ public ResolverChain getChain()
+ {
+ return chain;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedInEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedInEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedInEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,23 @@
+package org.jboss.seam.security.events;
+
+import java.security.Principal;
+
+/**
+ * This event is raised when user successfully logs in.
+ *
+ * @author Shane Bryzak
+ */
+public class LoggedInEvent
+{
+ private Principal principal;
+
+ public LoggedInEvent(Principal principal)
+ {
+ this.principal = principal;
+ }
+
+ public Principal getPrincipal()
+ {
+ return principal;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,23 @@
+package org.jboss.seam.security.events;
+
+import java.security.Principal;
+
+/**
+ * This event is raised just after the user unauthenticates
+ *
+ * @author Shane Bryzak
+ */
+public class LoggedOutEvent
+{
+ private Principal principal;
+
+ public LoggedOutEvent(Principal principal)
+ {
+ this.principal = principal;
+ }
+
+ public Principal getPrincipal()
+ {
+ return principal;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoginFailedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoginFailedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoginFailedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,23 @@
+package org.jboss.seam.security.events;
+
+import javax.security.auth.login.LoginException;
+
+/**
+ * This event is fired when an authentication attempt fails
+ *
+ * @author Shane Bryzak
+ */
+public class LoginFailedEvent
+{
+ private LoginException loginException;
+
+ public LoginFailedEvent(LoginException loginException)
+ {
+ this.loginException = loginException;
+ }
+
+ public LoginException getLoginException()
+ {
+ return loginException;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotAuthorizedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotAuthorizedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotAuthorizedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised when the user is not authorized to perform an operation
+ *
+ * @author Shane Bryzak
+ */
+public class NotAuthorizedEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotLoggedInEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotLoggedInEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/NotLoggedInEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised when an unauthenticated user attempts to performed a privileged operation
+ *
+ * @author Shane Bryzak
+ */
+public class NotLoggedInEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostAuthenticateEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostAuthenticateEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostAuthenticateEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised just after authentication
+ *
+ * @author Shane Bryzak
+ */
+public class PostAuthenticateEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreAuthenticateEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreAuthenticateEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreAuthenticateEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised just before authentication.
+ *
+ * @author Shane Bryzak
+ */
+public class PreAuthenticateEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,21 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised just before a new user is persisted
+ *
+ * @author Shane Bryzak
+ */
+public class PrePersistUserEvent
+{
+ private Object user;
+
+ public PrePersistUserEvent(Object user)
+ {
+ this.user = user;
+ }
+
+ public Object getUser()
+ {
+ return user;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserRoleEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserRoleEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PrePersistUserRoleEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,21 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised just before a user role is persisted
+ *
+ * @author Shane Bryzak
+ */
+public class PrePersistUserRoleEvent
+{
+ private Object xref;
+
+ public PrePersistUserRoleEvent(Object xref)
+ {
+ this.xref = xref;
+ }
+
+ public Object getXref()
+ {
+ return xref;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/QuietLoginEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/QuietLoginEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/QuietLoginEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised when the user performs a quiet login
+ *
+ * @author Shane Bryzak
+ */
+public class QuietLoginEvent
+{
+
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserAuthenticatedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserAuthenticatedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserAuthenticatedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,21 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised when a user is authenticated
+ *
+ * @author Shane Bryzak
+ */
+public class UserAuthenticatedEvent
+{
+ private Object user;
+
+ public UserAuthenticatedEvent(Object user)
+ {
+ this.user = user;
+ }
+
+ public Object getUser()
+ {
+ return user;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserCreatedEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserCreatedEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/UserCreatedEvent.java 2010-04-13 11:41:28 UTC (rev 12461)
@@ -0,0 +1,21 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised immediately after a user is created
+ *
+ * @author Shane Bryzak
+ */
+public class UserCreatedEvent
+{
+ private Object user;
+
+ public UserCreatedEvent(Object user)
+ {
+ this.user = user;
+ }
+
+ public Object getUser()
+ {
+ return user;
+ }
+}
16 years