Author: manaRH Date: 2012-03-14 13:22:25 -0400 (Wed, 14 Mar 2012) New Revision: 14386 Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/Entity.java branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionBean.java branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionJavaBean.java branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserAccount.java branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserRole.java branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl branches/community/Seam_2_3/jboss-seam-gen/pom.xml branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml Log: added ee6 updates into jboss-seam-gen Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/Entity.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/Entity.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/Entity.java 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,49 @@ +package @modelPackage@; + +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.GeneratedValue; +import javax.persistence.Version; +import javax.validation.constraints.Size; + +@Entity +public class @entityName@ implements Serializable +{ + // seam-gen attributes (you should probably edit these) + private Long id; + private Integer version; + private String name; + + // add additional entity attributes + + // seam-gen attribute getters/setters with annotations (you probably should edit) + + @Id @GeneratedValue + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @Version + public Integer getVersion() { + return version; + } + + private void setVersion(Integer version) { + this.version = version; + } + + @Size(max = 20) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionBean.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionBean.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionBean.java 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,45 @@ +package @actionPackage@; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.log.Log; +import org.jboss.seam.international.StatusMessages; +import javax.validation.constraints.Size; + +@Stateful +@Name("@componentName@") +public class @beanName@ implements @interfaceName@ +{ + @Logger private Log log; + + @In StatusMessages statusMessages; + + private String value; + + public void @methodName@() + { + // implement your business logic here + log.info(&quot;@componentName@.@methodName(a)() action called with: #{@componentName@.value}"); + statusMessages.add("@methodName@ #{@componentName@.value}"); + } + + // add additional action methods + + @Size(max = 10) + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } + + @Remove + public void destroy() {} + +} Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionJavaBean.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionJavaBean.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/FormActionJavaBean.java 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,39 @@ +package @actionPackage@; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.log.Log; +import org.jboss.seam.international.StatusMessages; +import javax.validation.constraints.Size; + +@Name("@componentName@") +public class @interfaceName@ +{ + @Logger private Log log; + + @In StatusMessages statusMessages; + + private String value; + + public void @methodName@() + { + // implement your business logic here + log.info(&quot;@componentName@.@methodName(a)() action called with: #{@componentName@.value}"); + statusMessages.add("@methodName@ #{@componentName@.value}"); + } + + // add additional action methods + + @Size(max = 10) + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } + +} Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserAccount.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserAccount.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserAccount.java 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,83 @@ +package @modelPackage@; + +import java.io.Serializable; +import java.util.Set; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +import javax.validation.constraints.NotNull; +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; + +@Entity +@Table(uniqueConstraints = @UniqueConstraint(columnNames = "username"), name = "user_account") +public class UserAccount implements Serializable { + private static final long serialVersionUID = 6368734442192368866L; + + private Long id; + private String username; + private String passwordHash; + private boolean enabled; + + private Set<UserRole> roles; + + @Id + @GeneratedValue + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @NotNull + @UserPrincipal + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + @UserPassword(hash = "SHA") + @Column(name = "password_hash") + public String getPasswordHash() { + return passwordHash; + } + + public void setPasswordHash(String passwordHash) { + this.passwordHash = passwordHash; + } + + @UserEnabled + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + @UserRoles + @ManyToMany + @JoinTable(name = "user_account_role", joinColumns = @JoinColumn(name = "account_id"), inverseJoinColumns = @JoinColumn(name = "member_of_role")) + public Set<UserRole> getRoles() { + return roles; + } + + public void setRoles(Set<UserRole> roles) { + this.roles = roles; + } +} Added: branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserRole.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserRole.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/src-ee6/UserRole.java 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,69 @@ +package @modelPackage@; + +import java.io.Serializable; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.Table; + +import javax.validation.constraints.NotNull; +import org.jboss.seam.annotations.security.management.RoleConditional; +import org.jboss.seam.annotations.security.management.RoleGroups; +import org.jboss.seam.annotations.security.management.RoleName; + +@Entity +@Table(name = "user_role") +public class UserRole implements Serializable { + private static final long serialVersionUID = 9177366120789064801L; + + private Long id; + private String name; + private boolean conditional; + + private Set<UserRole> groups; + + @Id + @GeneratedValue + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @RoleName + @NotNull + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @RoleGroups + @ManyToMany + @JoinTable(name = "user_role_group", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "member_of_role")) + public Set<UserRole> getGroups() { + return groups; + } + + public void setGroups(Set<UserRole> groups) { + this.groups = groups; + } + + @RoleConditional + public boolean isConditional() { + return conditional; + } + + public void setConditional(boolean conditional) { + this.conditional = conditional; + } +} Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl 2012-03-14 15:16:38 UTC (rev 14385) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl 2012-03-14 17:22:25 UTC (rev 14386) @@ -28,7 +28,7 @@ </#function> <#function isToOne property> - <#return property.value.class.name.matches("org.hibernate.mapping.(One|Many)ToOne")/> + <#return property.value.class.name.matches("javax.persistence.(One|Many)ToOne")/> </#function> <#function label property> Modified: branches/community/Seam_2_3/jboss-seam-gen/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 15:16:38 UTC (rev 14385) +++ branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) @@ -26,7 +26,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> + <descriptor>src/main/assembly/assembly${ee6-property}.xml</descriptor> </descriptors> <!-- <finalName>${project.build.finalName}-${project.version}</finalName>--> </configuration> @@ -210,6 +210,21 @@ </plugins> </build> </profile> + <profile> + <id>jsf2</id> + <properties> + <ee6-property>-ee6</ee6-property> + </properties> + </profile> + <profile> + <id>jsf12</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <ee6-property></ee6-property> + </properties> + </profile> </profiles> </project> Copied: branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml (from rev 14384, branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml) =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml (rev 0) +++ branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml 2012-03-14 17:22:25 UTC (rev 14386) @@ -0,0 +1,29 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-2.2.xsd"> + + <id>distribution-ee6</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Add distribution files --> + <fileSets> + <!-- Copy EE6 template variants --> + <fileSet> + <directory>./dist/src-ee6</directory> + <outputDirectory>./src</outputDirectory> + </fileSet> + <fileSet> + <directory>dist</directory> + <outputDirectory>.</outputDirectory> + <excludes> + <exclude>pom.xml</exclude> + <exclude>./src-ee6/</exclude> + </excludes> + </fileSet> + </fileSets> + + </assembly> \ No newline at end of file Modified: branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml 2012-03-14 15:16:38 UTC (rev 14385) +++ branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml 2012-03-14 17:22:25 UTC (rev 14386) @@ -17,8 +17,9 @@ <outputDirectory>.</outputDirectory> <excludes> <exclude>pom.xml</exclude> + <exclude>./src-ee6/</exclude> </excludes> </fileSet> </fileSets> - + </assembly> \ No newline at end of file