Seam SVN: r14386 - in branches/community/Seam_2_3/jboss-seam-gen: dist and 3 other directories.
by seam-commits＠lists.jboss.org
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("@componentName@.@methodName@() 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("@componentName@.@methodName@() 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/assembly/2.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 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
14 years
- 1
- 0
[forge/core] 8a366f: Initial prototype
by GitHub
Branch: refs/heads/FORGE-458
Home: https://github.com/forge/core
Commit: 8a366fc0eb6913922b0b31ff21d9869c2fd1bc11
https://github.com/forge/core/commit/8a366fc0eb6913922b0b31ff21d9869c2fd1...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M scaffold-api/src/main/java/org/jboss/forge/scaffold/ScaffoldProvider.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/FacesScaffold.java
M scaffold-plugins/src/main/java/org/jboss/forge/scaffold/plugins/ScaffoldPlugin.java
Log Message:
-----------
Initial prototype
14 years
- 1
- 0
[seam/rest] ada1b8: testsuite fix & SEAMREST-56 upgrade of jackson ver...
by GitHub
Branch: refs/heads/develop
Home: https://github.com/seam/rest
Commit: ada1b8efaa6f2032748a51bc93e6c734816aacbb
https://github.com/seam/rest/commit/ada1b8efaa6f2032748a51bc93e6c734816aacbb
Author: Tomas Remes <tremes(a)redhat.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
Changed paths:
M pom.xml
M testsuite/pom.xml
Log Message:
-----------
testsuite fix & SEAMREST-56 upgrade of jackson version
14 years, 1 month
- 1
- 0
Seam SVN: r14384 - in branches/community/Seam_2_3/examples-ee6/messages: messages-tests and 14 other directories.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-03-12 16:30:45 -0400 (Mon, 12 Mar 2012)
New Revision: 14384
Added:
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties
Removed:
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties
Log:
restored message testing from the update svn merge . -r14346:14345
Property changes on: branches/community/Seam_2_3/examples-ee6/messages/messages-tests
___________________________________________________________________
Added: svn:ignore
+ *.iml
target
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>messages</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-tests</artifactId>
- <name>Messages Integration Tests Module (EE6)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/resources-integration</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>arquillian</name>
- </property>
- </activation>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-managed</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-managed-7</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>arq-jbossas-7-remote</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-remote-7</value>
- </property>
- </activation>
- </profile>
-
- <profile>
- <id>ftest-jbossas</id>
- <properties>
- <example.context.path>seam-messages</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <param>${basedir}/../messages-ear/target/seam-messages.ear</param>
- </fileNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <example.context.path>jboss-seam-messages</example.context.path>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>messages</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-tests</artifactId>
+ <name>Messages Integration Tests Module (EE6)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>functional-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-integration</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>integration-tests</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ </property>
+ </activation>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-managed</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-managed-7</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-remote</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-remote-7</value>
+ </property>
+ </activation>
+ </profile>
+
+ <profile>
+ <id>ftest-jbossas</id>
+ <properties>
+ <example.context.path>seam-messages</example.context.path>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+ <param>${basedir}/../messages-ear/target/seam-messages.ear</param>
+ </fileNames>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ftest-tomcat</id>
+ <properties>
+ <example.context.path>jboss-seam-messages</example.context.path>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,115 +0,0 @@
-//$Id: MessageListTest.java 2383 2006-10-26 18:53:00Z gavin $
-package org.jboss.seam.example.messages.test;
-import javax.faces.model.DataModel;
-
-import java.io.File;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.importer.ZipImporter;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.OverProtocol;
-import org.jboss.arquillian.junit.Arquillian;
-
-import org.jboss.seam.mock.JUnitSeamTest;
-
-import org.junit.runner.RunWith;
-import org.junit.Test;
-
-(a)RunWith(Arquillian.class)
-public class MessageListTest extends JUnitSeamTest
-{
- @Deployment(name="MessageListTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-messages.ear").importFrom(new File("../messages-ear/target/seam-messages.ear"))
- .as(EnterpriseArchive.class);
- WebArchive web = er.getAsType(WebArchive.class, "messages-web.war");
- web.addClasses(MessageListTest.class);
-
- return er;
- }
-
- @Test
- public void testMessageList() throws Exception
- {
- new NonFacesRequest()
- {
-
- @Override
- protected void renderResponse() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==2;
- }
-
- }.run();
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==2;
- list.setRowIndex(1);
- }
-
-
- @Override
- protected void invokeApplication() throws Exception {
- invokeMethod("#{messageManager.select}");
- }
-
-
- @Override
- protected void renderResponse() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==2;
- assert getValue("#{message.title}").equals("Hello World");
- assert getValue("#{message.read}").equals(true);
- }
-
- }.run();
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==2;
- list.setRowIndex(0);
- }
-
-
- @Override
- protected void invokeApplication() throws Exception {
- invokeMethod("#{messageManager.delete}");
- }
-
-
- @Override
- protected void renderResponse() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==1;
- }
-
- }.run();
-
- new NonFacesRequest()
- {
-
- @Override
- protected void renderResponse() throws Exception {
- DataModel list = (DataModel) getInstance("messageList");
- assert list.getRowCount()==1;
- }
-
- }.run();
-
- }
-
-}
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/MessageListTest.java 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,115 @@
+//$Id: MessageListTest.java 2383 2006-10-26 18:53:00Z gavin $
+package org.jboss.seam.example.messages.test;
+import javax.faces.model.DataModel;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
+
+import org.jboss.seam.mock.JUnitSeamTest;
+
+import org.junit.runner.RunWith;
+import org.junit.Test;
+
+(a)RunWith(Arquillian.class)
+public class MessageListTest extends JUnitSeamTest
+{
+ @Deployment(name="MessageListTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-messages.ear").importFrom(new File("../messages-ear/target/seam-messages.ear"))
+ .as(EnterpriseArchive.class);
+ WebArchive web = er.getAsType(WebArchive.class, "messages-web.war");
+ web.addClasses(MessageListTest.class);
+
+ return er;
+ }
+
+ @Test
+ public void testMessageList() throws Exception
+ {
+ new NonFacesRequest()
+ {
+
+ @Override
+ protected void renderResponse() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==2;
+ }
+
+ }.run();
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==2;
+ list.setRowIndex(1);
+ }
+
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ invokeMethod("#{messageManager.select}");
+ }
+
+
+ @Override
+ protected void renderResponse() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==2;
+ assert getValue("#{message.title}").equals("Hello World");
+ assert getValue("#{message.read}").equals(true);
+ }
+
+ }.run();
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==2;
+ list.setRowIndex(0);
+ }
+
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ invokeMethod("#{messageManager.delete}");
+ }
+
+
+ @Override
+ protected void renderResponse() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==1;
+ }
+
+ }.run();
+
+ new NonFacesRequest()
+ {
+
+ @Override
+ protected void renderResponse() throws Exception {
+ DataModel list = (DataModel) getInstance("messageList");
+ assert list.getRowCount()==1;
+ }
+
+ }.run();
+
+ }
+
+}
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.example.messages.test.selenium;
-
-import java.text.MessageFormat;
-
-import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertEquals;
-
-/**
- * Test for messages example
- * @author Jozef Hartinger
- *
- */
-public class MessageTest extends SeamSeleniumTest
-{
-
- public static final String MESSAGES_URL = "/messages.seam";
- public static final String MESSAGES_LINK = "messages:{0}:link";
- public static final String MESSAGES_DELETE = "messages:{0}:delete";
- public static final String MESSAGES_CHECKBOX = "messages:{0}:read";
- public static final String MESSAGES_COUNT = "//table[@id='messages']/tbody/tr";
- public static final String MESSAGE_TITLE = "title";
- public static final String MESSAGE_TEXT = "text";
-
- @Override
- @BeforeMethod
- public void setUp()
- {
- super.setUp();
- browser.open(CONTEXT_PATH + MESSAGES_URL);
- }
-
- @Test(dataProvider = "messages")
- public void readMessageTest(int i, String title, String text)
- {
- browser.clickAndWait(MessageFormat.format(MESSAGES_LINK, i));
- assertEquals("Unexpected message title displayed.", title, browser.getText(MESSAGE_TITLE));
- assertEquals("Unexpected message text displayed.", text, browser.getText(MESSAGE_TEXT));
- assertTrue("Checkbox should be checked after message is read.", browser.isChecked(MessageFormat.format(MESSAGES_CHECKBOX, i)));
- }
-
- @Test(dependsOnMethods = {"readMessageTest"}, dataProvider = "messages")
- public void deleteMessageTest(int i, String title, String name)
- {
- int messageCount = browser.getXpathCount(MESSAGES_COUNT).intValue();
- // delete first message in a table
- browser.clickAndWait(MessageFormat.format(MESSAGES_DELETE, 0));
- assertEquals("Unexpected count of messages.", --messageCount, browser.getXpathCount(MESSAGES_COUNT));
- assertFalse("Message title still present.", browser.isTextPresent(title));
- }
-
- @DataProvider(name = "messages")
- public Object[][] getMessages()
- {
- Object[][] messages = { { 0, "Greetings Earthling", "This is another example of a message." }, { 1, "Hello World", "This is an example of a message." } };
- return messages;
- }
-}
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/java/org/jboss/seam/example/messages/test/selenium/MessageTest.java 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.example.messages.test.selenium;
+
+import java.text.MessageFormat;
+
+import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertEquals;
+
+/**
+ * Test for messages example
+ * @author Jozef Hartinger
+ *
+ */
+public class MessageTest extends SeamSeleniumTest
+{
+
+ public static final String MESSAGES_URL = "/messages.seam";
+ public static final String MESSAGES_LINK = "messages:{0}:link";
+ public static final String MESSAGES_DELETE = "messages:{0}:delete";
+ public static final String MESSAGES_CHECKBOX = "messages:{0}:read";
+ public static final String MESSAGES_COUNT = "//table[@id='messages']/tbody/tr";
+ public static final String MESSAGE_TITLE = "title";
+ public static final String MESSAGE_TEXT = "text";
+
+ @Override
+ @BeforeMethod
+ public void setUp()
+ {
+ super.setUp();
+ browser.open(CONTEXT_PATH + MESSAGES_URL);
+ }
+
+ @Test(dataProvider = "messages")
+ public void readMessageTest(int i, String title, String text)
+ {
+ browser.clickAndWait(MessageFormat.format(MESSAGES_LINK, i));
+ assertEquals("Unexpected message title displayed.", title, browser.getText(MESSAGE_TITLE));
+ assertEquals("Unexpected message text displayed.", text, browser.getText(MESSAGE_TEXT));
+ assertTrue("Checkbox should be checked after message is read.", browser.isChecked(MessageFormat.format(MESSAGES_CHECKBOX, i)));
+ }
+
+ @Test(dependsOnMethods = {"readMessageTest"}, dataProvider = "messages")
+ public void deleteMessageTest(int i, String title, String name)
+ {
+ int messageCount = browser.getXpathCount(MESSAGES_COUNT).intValue();
+ // delete first message in a table
+ browser.clickAndWait(MessageFormat.format(MESSAGES_DELETE, 0));
+ assertEquals("Unexpected count of messages.", --messageCount, browser.getXpathCount(MESSAGES_COUNT));
+ assertFalse("Message title still present.", browser.isTextPresent(title));
+ }
+
+ @DataProvider(name = "messages")
+ public Object[][] getMessages()
+ {
+ Object[][] messages = { { 0, "Greetings Earthling", "This is another example of a message." }, { 1, "Hello World", "This is an example of a message." } };
+ return messages;
+ }
+}
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
-
- <component name="org.jboss.seam.core.init">
- <property name="jndiPattern">#{ejbName}/local</property>
- </component>
-
-</components>
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/WEB-INF/components.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
+
+ <component name="org.jboss.seam.core.init">
+ <property name="jndiPattern">#{ejbName}/local</property>
+ </component>
+
+</components>
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,11 +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>jboss/datasources/ExampleDS</jndi-name>
- <connection-url>jdbc:hsqldb:.</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- </local-tx-datasource>
-</datasources>
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/jboss-seam-messaging-ds.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,11 @@
+<?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>jboss/datasources/ExampleDS</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ </local-tx-datasource>
+</datasources>
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,3 +0,0 @@
-#debug is explicitly disabled in test to avoid JBIDE-3623
-#Thu Dec 31 16:24:37 CET 2009
-org.jboss.seam.core.init.debug=false
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources/seam.properties 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,3 @@
+#debug is explicitly disabled in test to avoid JBIDE-3623
+#Thu Dec 31 16:24:37 CET 2009
+org.jboss.seam.core.init.debug=false
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,26 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual
- contributors. This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version. This software is
- distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not, write
- to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Messages example" verbose="2" parallel="false">
- <test name="messages_tests">
- <parameter name="PROPERTY_FILE" value="" />
- <classes>
- <class name="org.jboss.seam.example.messages.test.selenium.MessageTest" />
- </classes>
- </test>
-</suite>
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-ftest/testng.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,26 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2008, Red Hat
+ Middleware LLC, and individual contributors by the @authors tag. See
+ the copyright.txt in the distribution for a full listing of individual
+ contributors. This is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Messages example" verbose="2" parallel="false">
+ <test name="messages_tests">
+ <parameter name="PROPERTY_FILE" value="" />
+ <classes>
+ <class name="org.jboss.seam.example.messages.test.selenium.MessageTest" />
+ </classes>
+ </test>
+</suite>
Deleted: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml 2012-03-06 12:01:31 UTC (rev 14345)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://jboss.org/schema/arquillian"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <engine>
- <property name="deploymentExportPath">target/</property>
- </engine>
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
- <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
- </configuration>
- </container>
-
-</arquillian>
Copied: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml (from rev 14345, branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/src/test/resources-integration/arquillian.xml 2012-03-12 20:30:45 UTC (rev 14384)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
14 years, 1 month
- 1
- 0
[forge/core] 4ae72a: FORGE-496
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: 4ae72a65b0dcadf06830f0e6bea3994616fe1205
https://github.com/forge/core/commit/4ae72a65b0dcadf06830f0e6bea3994616fe...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M scaffold-plugins/src/main/java/org/jboss/forge/scaffold/plugins/ScaffoldPlugin.java
Log Message:
-----------
FORGE-496
14 years, 1 month
- 1
- 0
[forge/core] 15725c: Fix and test RestFacet destruction of other Servle...
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: 15725c5c6f99952a68f0cbbd765f7b437208e7f5
https://github.com/forge/core/commit/15725c5c6f99952a68f0cbbd765f7b437208...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestWebXmlFacetImpl.java
M javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
Log Message:
-----------
Fix and test RestFacet destruction of other ServletMappings
14 years, 1 month
- 1
- 0
[forge/core] b926be: Re-applied some lost changes in the REST plugin.
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: b926be8412fb8aa5ec4a733f404e080ff3eae07f
https://github.com/forge/core/commit/b926be8412fb8aa5ec4a733f404e080ff3ea...
Author: Paul Bakker <paul.bakker.nl(a)gmail.com>
Date: 2012-03-11 (Sun, 11 Mar 2012)
Changed paths:
R javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/JaxRsAnnotationVisitor.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestFacetImpl.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestPlugin.java
M javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
Log Message:
-----------
Re-applied some lost changes in the REST plugin.
14 years, 1 month
- 1
- 0
[forge/core] 60a07a: Now using the javaresource visitor to scan for app...
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: 60a07ac40dcba878745603a5c96f2b28a041e739
https://github.com/forge/core/commit/60a07ac40dcba878745603a5c96f2b28a041...
Author: Paul Bakker <paul.bakker.nl(a)gmail.com>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestApplicationFacetImpl.java
Log Message:
-----------
Now using the javaresource visitor to scan for applicationclass
Commit: f03af99a7a86e30964917429a92a552f1c03a30c
https://github.com/forge/core/commit/f03af99a7a86e30964917429a92a552f1c03...
Author: Paul Bakker <paul.bakker.nl(a)gmail.com>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M dev-plugins/pom.xml
M dev-plugins/src/main/java/org/jboss/forge/dev/PluginsPlugin.java
M dev-plugins/src/test/java/org/jboss/forge/dev/PluginsPluginTest.java
M dist/build.xml
M dist/pom.xml
M dist/src/main/resources/bin/forge.bat
M event-bus-api/pom.xml
R forge-install.bsh
A forge-install.bsh
M git-tools-tests/pom.xml
M git-tools/pom.xml
M javaee-api/pom.xml
M javaee-api/src/main/java/org/jboss/forge/spec/javaee/ServletFacet.java
M javaee-impl/pom.xml
A javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/ContentTypeCompleter.java
A javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/JaxRsAnnotationVisitor.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/servlet/ServletFacetImpl.java
M javaee-impl/src/main/resources/org/jboss/forge/rest/Endpoint.jv
M javaee-impl/src/test/java/org/jboss/forge/spec/servlet/ServletPluginTest.java
M maven-api/pom.xml
M parser-java-api/pom.xml
M parser-java-api/src/main/java/org/jboss/forge/parser/java/EnumConstant.java
M parser-java-api/src/main/java/org/jboss/forge/parser/java/JavaEnum.java
M parser-java-api/src/main/java/org/jboss/forge/parser/java/util/Types.java
M parser-java/pom.xml
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/EnumConstantImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/JavaClassImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/JavaEnumImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/MethodImpl.java
M parser-java/src/test/java/org/jboss/forge/test/parser/java/JavaClassTest.java
M parser-java/src/test/java/org/jboss/forge/test/parser/java/util/TypesTest.java
M parser-xml/pom.xml
M plugin-loader/pom.xml
M pom.xml
M project-model-maven-tests/pom.xml
M project-model-maven-tests/src/test/java/org/jboss/forge/maven/facets/MavenPluginFacetTest.java
M project-model-maven-tests/src/test/java/org/jboss/forge/maven/util/ProjectModelTest.java
M project-model-maven/pom.xml
M project-model-maven/src/main/java/org/jboss/forge/maven/facets/MavenPluginFacetImpl.java
M scaffold-api/pom.xml
M scaffold-faces/pom.xml
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/FacesScaffold.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/ForgeInspector.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/propertystyle/ForgePropertyStyle.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/QueryByExampleWidgetBuilder.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetprocessor/UnsearchableWidgetProcessor.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/FacesScaffoldTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/QueryByExampleWidgetBuilderTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetprocessor/UnsearchableWidgetProcessorTest.java
M scaffold-plugins/pom.xml
M shell-api/pom.xml
M shell-api/src/main/java/org/jboss/forge/resources/AbstractResource.java
M shell-api/src/main/java/org/jboss/forge/resources/enumtype/EnumConstantResource.java
M shell-api/src/main/java/org/jboss/forge/resources/java/JavaResource.java
M shell/pom.xml
M shell/src/main/java/org/jboss/forge/shell/env/ConfigurationAdapter.java
M shell/src/main/java/org/jboss/forge/shell/env/ConfigurationImpl.java
M shell/src/main/java/org/jboss/forge/shell/env/ScopedConfigurationAdapter.java
M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/ForgePlugin.java
M shell/src/main/java/org/jboss/forge/shell/plugins/builtin/NewProjectPlugin.java
A shell/src/main/java/org/jboss/forge/shell/util/ForgeProxySelector.java
M shell/src/main/java/org/jboss/forge/shell/util/PluginUtil.java
A shell/src/main/java/org/jboss/forge/shell/util/ProxySettings.java
M shell/src/test/java/org/jboss/forge/env/ConfigurationImplTest.java
M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/ForgePluginTest.java
M shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/NewProjectPluginTest.java
M test-harness-web/pom.xml
M test-harness/pom.xml
Log Message:
-----------
Merge branch 'master' of github.com:forge/core
Conflicts:
javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestFacetImpl.java
javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestPlugin.java
javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
Commit: 025207bb946bf6d3d9b6cc68b0703ec085ebd551
https://github.com/forge/core/commit/025207bb946bf6d3d9b6cc68b0703ec085eb...
Author: Paul Bakker <paul.bakker.nl(a)gmail.com>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestApplicationFacetImpl.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestPlugin.java
M javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
Log Message:
-----------
Refactored REST plugin so that it can either be configured using web.xml or an Application class.
Compare: https://github.com/forge/core/compare/854654f...025207b
14 years, 1 month
- 1
- 0
[forge/core] 854654: FORGE-491 FORGE-492 FORGE-493
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: 854654f8c4b84aa211aab806b8f08d46c54d3e1b
https://github.com/forge/core/commit/854654f8c4b84aa211aab806b8f08d46c54d...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M javaee-api/src/main/java/org/jboss/forge/spec/javaee/ServletFacet.java
A javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/ContentTypeCompleter.java
A javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/JaxRsAnnotationVisitor.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestFacetImpl.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/rest/RestPlugin.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/servlet/ServletFacetImpl.java
M javaee-impl/src/main/resources/org/jboss/forge/rest/Endpoint.jv
M javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
M javaee-impl/src/test/java/org/jboss/forge/spec/servlet/ServletPluginTest.java
M parser-java-api/src/main/java/org/jboss/forge/parser/java/EnumConstant.java
M parser-java-api/src/main/java/org/jboss/forge/parser/java/JavaEnum.java
M parser-java-api/src/main/java/org/jboss/forge/parser/java/util/Types.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/EnumConstantImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/JavaClassImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/JavaEnumImpl.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/MethodImpl.java
M parser-java/src/test/java/org/jboss/forge/test/parser/java/JavaClassTest.java
M parser-java/src/test/java/org/jboss/forge/test/parser/java/util/TypesTest.java
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/inspector/propertystyle/ForgePropertyStyle.java
M shell-api/src/main/java/org/jboss/forge/resources/enumtype/EnumConstantResource.java
M shell-api/src/main/java/org/jboss/forge/resources/java/JavaResource.java
Log Message:
-----------
FORGE-491 FORGE-492 FORGE-493
14 years, 1 month
- 1
- 0
Seam SVN: r14383 - branches/enterprise/JBPAPP_5_0/examples/seambay/src/org/jboss/seam/example/seambay.
by seam-commits＠lists.jboss.org
Author: rsmeral
Date: 2012-03-09 04:49:42 -0500 (Fri, 09 Mar 2012)
New Revision: 14383
Modified:
branches/enterprise/JBPAPP_5_0/examples/seambay/src/org/jboss/seam/example/seambay/CategoryAction.java
Log:
ordering added to allCategories query in CategoryAction
Modified: branches/enterprise/JBPAPP_5_0/examples/seambay/src/org/jboss/seam/example/seambay/CategoryAction.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seambay/src/org/jboss/seam/example/seambay/CategoryAction.java 2012-03-09 09:48:42 UTC (rev 14382)
+++ branches/enterprise/JBPAPP_5_0/examples/seambay/src/org/jboss/seam/example/seambay/CategoryAction.java 2012-03-09 09:49:42 UTC (rev 14383)
@@ -48,7 +48,7 @@
@WebRemote
public List<Category> getAllCategories()
{
- allCategories = entityManager.createQuery("from Category").getResultList();
+ allCategories = entityManager.createQuery("from Category order by categoryId").getResultList();
return allCategories;
}
14 years, 1 month
- 1
- 0