Author: dan.j.allen Date: 2011-03-31 19:05:46 -0400 (Thu, 31 Mar 2011) New Revision: 7220 Modified: archetypes/javaee6-webapp/trunk/archetype-pom.xml archetypes/javaee6-webapp/trunk/create-archetype.sh archetypes/javaee6-webapp/trunk/pom.xml archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml archetypes/javaee6-webapp/trunk/src/main/resources/META-INF/persistence.xml archetypes/javaee6-webapp/trunk/src/main/webapp/META-INF/context.xml archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/beans.xml archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml archetypes/javaee6-webapp/trunk/src/main/webapp/index.jsf archetypes/javaee6-webapp/trunk/src/main/webapp/index.xhtml archetypes/javaee6-webapp/trunk/src/main/webapp/resources/css/screen.css archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/sun-resources.xml archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/test-persistence.xml archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/test-persistence.xml archetypes/javaee6-webapp/trunk/src/test/resources/arquillian.xml Log: adopt JBoss Community formatting profile fix arquillian configuration Modified: archetypes/javaee6-webapp/trunk/archetype-pom.xml =================================================================== --- archetypes/javaee6-webapp/trunk/archetype-pom.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/archetype-pom.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,116 +1,116 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>17</version> - </parent> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>17</version> + </parent> - <groupId>org.jboss.weld.archetypes</groupId> - <artifactId>jboss-javaee6-webapp</artifactId> - <version>1.0.1-SNAPSHOT</version> - <packaging>maven-archetype</packaging> + <groupId>org.jboss.weld.archetypes</groupId> + <artifactId>jboss-javaee6-webapp</artifactId> + <version>1.0.1-SNAPSHOT</version> + <packaging>maven-archetype</packaging> - <name>JBoss Java EE 6 Webapp</name> + <name>JBoss Java EE 6 Webapp</name> - <description>An archetype that generates a starter Java EE 6 webapp project</description> + <description>An archetype that generates a starter Java EE 6 webapp project</description> - <url>http://tinyurl.com/gojavaee</url> + <url>http://tinyurl.com/gojavaee</url> - <developers> - <developer> - <name>Steven Boscarine</name> - <roles> - <role>Weld archetypes co-lead</role> - </roles> - <email&gt;stevenboscarine(a)gmail.com&lt;/email&gt; - <organization>Community Volunteer</organization> - </developer> - <developer> - <name>Dan Allen</name> - <roles> - <role>Weld archetypes co-lead</role> - </roles> - <email&gt;dan.j.allen(a)gmail.com&lt;/email&gt; - <organization>JBoss, by Red Hat</organization> - <organizationUrl>http://redhat.com/jboss</organizationUrl> - <url>http://community.jboss.org/people/dan.j.allen</url> - </developer> - <developer> - <name>Pete Muir</name> - <roles> - <role>Weld project lead</role> - </roles> - <email&gt;pete.muir(a)jboss.org&lt;/email&gt; - <organization>Red Hat Inc.</organization> - <organizationUrl>http://redhat.com/jboss</organizationUrl> - <url>http://in.relation.to/Bloggers/Pete</url> - </developer> - </developers> + <developers> + <developer> + <name>Steven Boscarine</name> + <roles> + <role>Weld archetypes co-lead</role> + </roles> + <email&gt;stevenboscarine(a)gmail.com&lt;/email&gt; + <organization>Community Volunteer</organization> + </developer> + <developer> + <name>Dan Allen</name> + <roles> + <role>Weld archetypes co-lead</role> + </roles> + <email&gt;dan.j.allen(a)gmail.com&lt;/email&gt; + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://redhat.com/jboss</organizationUrl> + <url>http://community.jboss.org/people/dan.j.allen</url> + </developer> + <developer> + <name>Pete Muir</name> + <roles> + <role>Weld project lead</role> + </roles> + <email&gt;pete.muir(a)jboss.org&lt;/email&gt; + <organization>Red Hat Inc.</organization> + <organizationUrl>http://redhat.com/jboss</organizationUrl> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + </developers> - <repositories> - <repository> - <id>jboss-public-repository</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public</url> - <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> - <releases> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <updatePolicy>daily</updatePolicy> - </snapshots> - </repository> - </repositories> + <repositories> + <repository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/nexus/content/groups/public</url> + <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <updatePolicy>daily</updatePolicy> + </snapshots> + </repository> + </repositories> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-5</version> - </extension> - </extensions> + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-5</version> + </extension> + </extensions> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-5</version> - <extensions>true</extensions> - </plugin> - <!-- Uncomment to deploy to central --> - <!-- - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-maven-plugin</artifactId> - <configuration> - <nexusUrl>https://oss.sonatype.org</nexusUrl> - <serverAuthId>central-releases-repository</serverAuthId> - </configuration> - </plugin> - --> - </plugins> - </pluginManagement> - </build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-5</version> + <extensions>true</extensions> + </plugin> + <!-- Uncomment to deploy to central --> + <!-- + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-maven-plugin</artifactId> + <configuration> + <nexusUrl>https://oss.sonatype.org</nexusUrl> + <serverAuthId>central-releases-repository</serverAuthId> + </configuration> + </plugin> + --> + </plugins> + </pluginManagement> + </build> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/java... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetype... - <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/tru... - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/java... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetype... + <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/tru... + </scm> - <!-- Uncomment to deploy to central --> - <!-- - <distributionManagement> - <repository> - <id>central-releases-repository</id> - <name>Sonatype Nexus Maven Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... - </repository> - </distributionManagement> - --> + <!-- Uncomment to deploy to central --> + <!-- + <distributionManagement> + <repository> + <id>central-releases-repository</id> + <name>Sonatype Nexus Maven Repository</name> + <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... + </repository> + </distributionManagement> + --> </project> Modified: archetypes/javaee6-webapp/trunk/create-archetype.sh =================================================================== --- archetypes/javaee6-webapp/trunk/create-archetype.sh 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/create-archetype.sh 2011-03-31 23:05:46 UTC (rev 7220) @@ -14,9 +14,9 @@ echo Generating archetype from project into $ARCHETYPE_BUILD_DIR... if [ ! -z `which txt2html` ]; then - txt2html -pb 1 -p 2 readme.txt > readme.html + txt2html -pb 1 -p 2 readme.txt > readme.html else - echo txt2html cannot be found, skipping generation of readme.html + echo txt2html cannot be found, skipping generation of readme.html fi mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties echo Relocating generated archetype project to $ARCHETYPE_DIR... @@ -42,15 +42,15 @@ rm -f readme.html # could set the release version at this point, if specified if [ ! -z $1 ] && [ "$1" = "install" ]; then - echo Installing archetype... - shift - mvn -f $ARCHETYPE_DIR/pom.xml install + echo Installing archetype... + shift + mvn -f $ARCHETYPE_DIR/pom.xml install fi if [ ! -z $1 ] && [ "$1" = "generate" ]; then - echo Generating project from archetype... - cd target - mvn archetype:generate -B -DarchetypeCatalog=local \ - -DarchetypeArtifactId=jboss-javaee6-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \ - -DartifactId=example-project -DgroupId=com.acme -Dpackage=com.acme.example -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project" + echo Generating project from archetype... + cd target + mvn archetype:generate -B -DarchetypeCatalog=local \ + -DarchetypeArtifactId=jboss-javaee6-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \ + -DartifactId=example-project -DgroupId=com.acme -Dpackage=com.acme.example -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project" fi Modified: archetypes/javaee6-webapp/trunk/pom.xml =================================================================== --- archetypes/javaee6-webapp/trunk/pom.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/pom.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,325 +1,321 @@ <?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> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld.archetypes</groupId> - <artifactId>jboss-javaee6-webapp-src</artifactId> - <version>1.0.1-SNAPSHOT</version> - <packaging>war</packaging> + <groupId>org.jboss.weld.archetypes</groupId> + <artifactId>jboss-javaee6-webapp-src</artifactId> + <version>1.0.1-SNAPSHOT</version> + <packaging>war</packaging> - <name>jboss-javaee6-webapp-src</name> - <description>A starter Java EE 6 webapp project that targets Java EE 6-compliant application servers, generated from the jboss-javaee6-webapp archetype</description> + <name>jboss-javaee6-webapp-src</name> + <description>A starter Java EE 6 webapp project for use on Java EE 6-compliant application servers, generated from the jboss-javaee6-webapp archetype</description> - <properties> - <!-- Explicitly declaring the source encoding eliminates the following message: --> - <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Timestamp format for the maven.build.timestamp property --> - <!-- You can reference property in pom.xml or filtered resources (must enable third-party plugin if using Maven < 2.1) --> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> - <!-- Set the jboss.home property in an active profile of the $HOME/.m2/settings.xml to specify the JBoss AS directory - the "Maven way" --> - <!-- By default, we assign it to the value of the JBOSS_HOME envrionment variable --> - <jboss.home>${env.JBOSS_HOME}</jboss.home> - <jboss.domain>default</jboss.domain> - <arquillian.version>1.0.0.Alpha5</arquillian.version> - <jboss-javaee6-spec.version>1.0.0.Final</jboss-javaee6-spec.version> - </properties> + <properties> + <!-- Explicitly declaring the source encoding eliminates the following message: --> + <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Timestamp format for the maven.build.timestamp property --> + <!-- You can reference property in pom.xml or filtered resources (must enable third-party plugin if using Maven < 2.1) --> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <!-- To specify the JBoss AS directory the "Maven way", set the jboss.home property in an active profile in $HOME/.m2/settings.xml --> + <!-- By default, we assign it to the value of the JBOSS_HOME envrionment variable --> + <jboss.home>${env.JBOSS_HOME}</jboss.home> + <jboss.domain>default</jboss.domain> + <arquillian.version>1.0.0.Alpha5</arquillian.version> + <jboss-javaee6-spec.version>1.0.0.Final</jboss-javaee6-spec.version> + </properties> - <repositories> - <!-- The JBoss Community public repository is a composite repository of several major repositories --> - <!-- see http://community.jboss.org/wiki/MavenGettingStarted-Users --> - <!-- At the time of writing, Arquillian and the JBoss Java EE specification POMs are only in the JBoss Community public - repository (not Maven central) --> - <repository> - <id>jboss-public-repository</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public</url> - <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> - <releases> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <updatePolicy>daily</updatePolicy> - </snapshots> - </repository> - </repositories> + <repositories> + <!-- The JBoss Community public repository is a composite repository of several major repositories --> + <!-- see http://community.jboss.org/wiki/MavenGettingStarted-Users --> + <!-- At the time of writing, Arquillian and the JBoss Java EE specification POMs are only in the JBoss Community public + repository (not Maven central) --> + <repository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/nexus/content/groups/public</url> + <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <updatePolicy>daily</updatePolicy> + </snapshots> + </repository> + </repositories> - <pluginRepositories> - <pluginRepository> - <id>jboss-public-repository</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public</url> - <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> - <releases> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <!-- Set to true to fix error in which Maven cannot find org.apache.maven.plugins:maven-archetype-plugin:maven-plugin:2.0-alpha-6-SNAPSHOT --> - <updatePolicy>daily</updatePolicy> - </snapshots> - </pluginRepository> - </pluginRepositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/nexus/content/groups/public</url> + <!-- These optional flags are designed to speed up your builds by reducing remote server calls --> + <releases> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <!-- Set to true to fix error in which Maven cannot find org.apache.maven.plugins:maven-archetype-plugin:maven-plugin:2.0-alpha-6-SNAPSHOT --> + <updatePolicy>daily</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> - <dependencies> - <!-- JPA 2.0 typesafe criteria queries. --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jpamodelgen</artifactId> - <version>1.1.1.Final</version> - <scope>provided</scope> - <!-- Excluded because it's provided by the Java EE 6 dependencies --> - <exclusions> - <exclusion> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencies> + <!-- Annotation processor to generate the JPA 2.0 metamodel classes for typesafe criteria queries --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jpamodelgen</artifactId> + <version>1.1.1.Final</version> + <scope>provided</scope> + <!-- Excluded because it's provided by the Java EE 6 dependencies --> + <exclusions> + <exclusion> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> + </dependency> - <!-- Seam Solder provides convenient, portable CDI extensions such as an injectable logger --> - <dependency> - <groupId>org.jboss.seam.solder</groupId> - <artifactId>seam-solder</artifactId> - <version>3.0.0.Final</version> - </dependency> + <!-- Seam Solder provides convenient, portable CDI extensions such as an injectable logger --> + <dependency> + <groupId>org.jboss.seam.solder</groupId> + <artifactId>seam-solder</artifactId> + <version>3.0.0.Final</version> + </dependency> - <!-- JSR-303 (Bean Validation) Implementation --> - <!-- Provides portable constraints such as @Email --> - <!-- Hibernate Validator is the only JSR-303 implementation at the moment, so we can assume it's provided --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.1.0.Final</version> - <scope>provided</scope> - </dependency> + <!-- JSR-303 (Bean Validation) Implementation --> + <!-- Provides portable constraints such as @Email --> + <!-- Hibernate Validator is the only JSR-303 implementation at the moment, so we can assume it's provided --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.1.0.Final</version> + <scope>provided</scope> + </dependency> - <!-- Needed for running tests (you may also use TestNG) --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> + <!-- Needed for running tests (you may also use TestNG) --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - <!-- Optional, but highly recommended --> - <!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from JUnit/TestNG --> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <!-- Optional, but highly recommended --> + <!-- Arquillian allows you to test enterprise code such as EJBs and Transactional(JTA) JPA from JUnit/TestNG --> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <!-- Compiler plugin enforces Java 1.6 compatibility and activates annotation processors --> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <!-- Compiler plugin enforces Java 1.6 compatibility and activates annotation processors --> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <!-- The default profile skips all tests, though you can tune it to run just unit tests based on a custom pattern --> - <!-- Seperate profiles are provided for running all tests, including Arquillian tests that execute in the specified - container --> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <!-- Java EE 6 API dependency --> - <!-- This one dependency imports all APIs available for a Java EE 6.0 application --> - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <version>${jboss-javaee6-spec.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <!-- Optional JBoss deployer plugin will deploy your war to a local JBoss AS container if you've declared - $JBOSS_HOME in your OS --> - <!-- To use, set the JBOSS_HOME environment variable (or jboss.home in $HOME/.m2/settings.xml) and run 'mvn - package jboss:hard-deploy' --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.4.1</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <!-- JNDI DataSource that connects to in-memory HSQLDB to demonstrate JPA --> - <fileName>src/main/resources-jbossas/default-ds.xml</fileName> - <!-- DataSource needs to go before the application --> - <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> - </fileNames> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profiles> + <profile> + <!-- The default profile skips all tests, though you can tune it to run just unit tests based on a custom pattern --> + <!-- Seperate profiles are provided for running all tests, including Arquillian tests that execute in the specified container --> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <!-- Java EE 6 API dependency --> + <!-- This one dependency imports all APIs available for a Java EE 6.0 application --> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- Optional plugin deploys your war to a local JBoss AS container --> + <!-- To use, set the JBOSS_HOME environment variable (or jboss.home in $HOME/.m2/settings.xml) and run: + mvn package jboss:hard-deploy --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <version>1.4.1</version> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <!-- JNDI DataSource that connects to in-memory HSQLDB to demonstrate JPA --> + <fileName>src/main/resources-jbossas/default-ds.xml</fileName> + <!-- DataSource needs to go before the application --> + <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + </profile> - <profile> - <!-- An optional Arquillian testing profile that executes tests in GlassFish Embedded --> - <!-- Tests are broken under Arquillian 1.0.0.Alpha5 since sun-resources.xml is not supported --> - <!-- Run with 'mvn clean test -Parq-glassfish-embedded' --> - <id>arq-glassfish-embedded</id> - <dependencies> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-glassfish-embedded-3</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <!-- This imports the Java EE 6 runtime libraries provided by GlassFish Embedded --> - <dependency> - <groupId>org.glassfish.extras</groupId> - <artifactId>glassfish-embedded-all</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - <!-- Overrides default configuration to use alternate persistence.xml with eclipselink settings and declare - a Glassfish Datasource --> - <!-- Used by Arquillian --> - <testResource> - <directory>src/test/resources-glassfish-embedded</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <!-- don't use version 2.5 as it creates seperate test suites per class --> - <version>2.4.3</version> - <configuration> - <systemProperties> - <!-- This optional property fixes an annoyance with Glassfish that puts derby.log in the project - root --> - <property> - <name>derby.stream.error.file</name> - <!-- If you save the log in target it is less likely to get committed in your project --> - <value>target/derby.log</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> + <!-- An optional Arquillian testing profile that executes tests in GlassFish Embedded --> + <!-- Tests are broken under Arquillian 1.0.0.Alpha5 since sun-resources.xml is not supported --> + <!-- Run with: mvn clean test -Parq-glassfish-embedded --> + <id>arq-glassfish-embedded</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-embedded-3</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <!-- This imports the Java EE 6 runtime libraries provided by GlassFish Embedded --> + <dependency> + <groupId>org.glassfish.extras</groupId> + <artifactId>glassfish-embedded-all</artifactId> + <version>3.0.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <!-- Overrides default configuration to use alternate persistence.xml with eclipselink settings and declare + a Glassfish Datasource --> + <!-- Used by Arquillian --> + <testResource> + <directory>src/test/resources-glassfish-embedded</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <!-- don't use version 2.5 as it creates seperate test suites per class --> + <version>2.4.3</version> + <configuration> + <systemProperties> + <!-- This optional property fixes an annoyance with Glassfish that puts derby.log in the project + root --> + <property> + <name>derby.stream.error.file</name> + <!-- If you save the log in target it is less likely to get committed in your project --> + <value>target/derby.log</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> - <profile> - <!-- An optional Arquillian testing profile that executes tests in a remote JBoss AS instance --> - <!-- Run with 'mvn clean test -Parq-jbossas-remote' --> - <id>arq-jbossas-remote</id> - <dependencies> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-jbossas-remote-6</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <!-- Java EE 6 API dependency --> - <!-- This one dependency imports all APIs available for a Java EE 6.0 application --> - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <version>${jboss-javaee6-spec.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - <!-- needed for org.jnp.interfaces.NamingContextFactory --> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <version>6.0.0.Final</version> - <type>pom</type> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - <!-- Overrides default configuration to use alternate persistence.xml with Hibernate settings and declare - a JBoss AS Datasource --> - <!-- Used by Arquillian --> - <testResource> - <directory>src/test/resources-jbossas</directory> - </testResource> - </testResources> - </build> - </profile> + <profile> + <!-- An optional Arquillian testing profile that executes tests in a remote JBoss AS instance --> + <!-- Run with: mvn clean test -Parq-jbossas-remote --> + <id>arq-jbossas-remote</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-jbossas-remote-6</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <!-- Java EE 6 API dependency --> + <!-- This one dependency imports all APIs available for a Java EE 6.0 application --> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + <!-- needed for org.jnp.interfaces.NamingContextFactory --> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <version>6.0.0.Final</version> + <type>pom</type> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <!-- Overrides default configuration to use alternate persistence.xml with default JBoss AS data source --> + <!-- Used by Arquillian --> + <testResource> + <directory>src/test/resources-jbossas</directory> + </testResource> + </testResources> + </build> + </profile> - <profile> - <id>arq-weld-ee-embedded</id> - <dependencies> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-ee-embedded-1.1</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <version>${jboss-javaee6-spec.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <dependencyManagement> + <profile> + <id>arq-weld-ee-embedded</id> <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <version>1.1.0.Final</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-ee-embedded-1.1</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>${jboss-javaee6-spec.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> - </dependencyManagement> - </profile> - </profiles> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>1.1.0.Final</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + </profile> + </profiles> </project> Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -17,47 +17,44 @@ // Adding the @Stateful annotation eliminates need for manual transaction demarcation // @javax.ejb.Stateful // The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an EL name -// Read more about the @Model stereotype in this FAQ: http://seamframework.org/Documentation/WhatIsThePurposeOfTheModelAnnotation +// Read more about the @Model stereotype in this FAQ: http://sfwk.org/Documentation/WhatIsThePurposeOfTheModelAnnotation @Model -public class MemberRegistration -{ - @Inject @Category("jboss-javaee6-webapp-src") - private Logger log; +public class MemberRegistration { + @Inject + @Category("jboss-javaee6-webapp-src") + private Logger log; - @Inject - @MemberRepository - private EntityManager em; + @Inject + @MemberRepository + private EntityManager em; - @Inject - private UserTransaction utx; + @Inject + private UserTransaction utx; - @Inject - private Event<Member> memberEventSrc; + @Inject + private Event<Member> memberEventSrc; - private Member newMember; + private Member newMember; - @Produces - @Named - public Member getNewMember() - { - return newMember; - } + @Produces + @Named + public Member getNewMember() { + return newMember; + } - public void register() throws Exception - { - log.info("Registering " + newMember.getName()); - // UserTransaction only needed when bean is not an EJB - utx.begin(); - em.joinTransaction(); - em.persist(newMember); - utx.commit(); - memberEventSrc.fire(newMember); - initNewMember(); - } + public void register() throws Exception { + log.info("Registering " + newMember.getName()); + // UserTransaction only needed when bean is not an EJB + utx.begin(); + em.joinTransaction(); + em.persist(newMember); + utx.commit(); + memberEventSrc.fire(newMember); + initNewMember(); + } - @PostConstruct - public void initNewMember() - { - newMember = new Member(); - } + @PostConstruct + public void initNewMember() { + newMember = new Member(); + } } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -16,36 +16,32 @@ import javax.persistence.criteria.Root; @RequestScoped -public class MemberListProducer -{ - @Inject - @MemberRepository - private EntityManager em; +public class MemberListProducer { + @Inject + @MemberRepository + private EntityManager em; - private List<Member> members; + private List<Member> members; - // The @Named annotation allows us to access the return value via the EL variable name "member" in the UI (e.g., Facelets or JSP view) - @Produces - @Named - public List<Member> getMembers() - { - return members; - } + // @Named provides access the return value via the EL variable name "member" in the UI (e.g., Facelets or JSP view) + @Produces + @Named + public List<Member> getMembers() { + return members; + } - public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) - { - retrieveAllMembersOrderedByName(); - } + public void onMemberListChanged(@Observes(notifyObserver = Reception.IF_EXISTS) final Member member) { + retrieveAllMembersOrderedByName(); + } - @PostConstruct - public void retrieveAllMembersOrderedByName() - { - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<Member> criteria = cb.createQuery(Member.class); - Root<Member> member = criteria.from(Member.class); - // Swap criteria statements if you would like to try out type-safe criteria queries, a new feature in JPA 2.0 - // criteria.select(member).orderBy(cb.asc(member.get(Member_.name))); - criteria.select(member).orderBy(cb.asc(member.get("name"))); - members = em.createQuery(criteria).getResultList(); - } + @PostConstruct + public void retrieveAllMembersOrderedByName() { + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery<Member> criteria = cb.createQuery(Member.class); + Root<Member> member = criteria.from(Member.class); + // Swap criteria statements if you would like to try out type-safe criteria queries, a new feature in JPA 2.0 + // criteria.select(member).orderBy(cb.asc(member.get(Member_.name))); + criteria.select(member).orderBy(cb.asc(member.get("name"))); + members = em.createQuery(criteria).getResultList(); + } } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepository.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -8,14 +8,13 @@ import javax.inject.Qualifier; /** - * A qualifier used to differentiate between multiple data repositories. + * A qualifier used to differentiate between multiple data repositories. * * If you only have 1 EntityManager, this annotation is optional */ @Qualifier @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) -public @interface MemberRepository -{ - /* class body intentionally left blank */ +public @interface MemberRepository { + /* class body intentionally left blank */ } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -5,21 +5,23 @@ import javax.persistence.PersistenceContext; /** - * This class uses CDI to produce EntityManager instances qualified that are - * qualified as &#064;MemberRepository. + * This class uses CDI to produce EntityManager instances qualified that are qualified as &#064;MemberRepository. * - * <p>Example injection on a managed bean field:</p> + * <p> + * Example injection on a managed bean field: + * </p> + * * <pre> - * &#064;Inject &#064;MemberRepository + * &#064;Inject + * &#064;MemberRepository * private EntityManager memberRepository; * </pre> */ -public class MemberRepositoryProducer -{ - // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly - @SuppressWarnings("unused") - @Produces - @MemberRepository - @PersistenceContext - private EntityManager em; +public class MemberRepositoryProducer { + // use @SuppressWarnings to tell IDE to ignore warnings about field not being referenced directly + @SuppressWarnings("unused") + @Produces + @MemberRepository + @PersistenceContext + private EntityManager em; } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -16,54 +16,49 @@ /** * Import seed data into the database on application startup. * - * <p>Observes the context initialized event and loads seed data - * into the database using JPA.</p> + * <p> + * Observes the context initialized event and loads seed data into the database using JPA. + * </p> * - * <p>As an alternative, you can perform the data loading by observing the context - * initialized event of a ServletContextListener</p> - * + * <p> + * As an alternative, you can perform the data loading by observing the context initialized event of a ServletContextListener + * </p> + * * @author Dan Allen */ @Startup @Singleton -public class SeedDataImporter -{ - @Inject @Category("jboss-javaee6-webapp-src") - private Logger log; - - @Inject - @MemberRepository - private EntityManager em; - - @Inject - private UserTransaction tx; +public class SeedDataImporter { + @Inject + @Category("jboss-javaee6-webapp-src") + private Logger log; - @PostConstruct - public void importData() - { - Member member1 = new Member(); - member1.setName("John Smith"); - member1.setEmail(&quot;john.smith(a)mailinator.com&quot;); - member1.setPhoneNumber("2125551212"); - try - { - try - { - em.persist(member1); - } - catch (TransactionRequiredException e) - { - // manual transaction control required in @PostConstruct method - // only use if enforced by JPA provider (due to bug in GlassFish) - tx.begin(); - em.persist(member1); - tx.commit(); - } - log.info("Successfully imported seed data."); - } - catch (Exception e) - { - log.warn("Seed data import failed.", e); - } - } + @Inject + @MemberRepository + private EntityManager em; + + @Inject + private UserTransaction tx; + + @PostConstruct + public void importData() { + Member member1 = new Member(); + member1.setName("John Smith"); + member1.setEmail(&quot;john.smith(a)mailinator.com&quot;); + member1.setPhoneNumber("2125551212"); + try { + try { + em.persist(member1); + } catch (TransactionRequiredException e) { + // manual transaction control required in @PostConstruct method + // only use if enforced by JPA provider (due to bug in GlassFish) + tx.begin(); + em.persist(member1); + tx.commit(); + } + log.info("Successfully imported seed data."); + } catch (Exception e) { + log.warn("Seed data import failed.", e); + } + } } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/model/Member.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -19,65 +19,56 @@ @Entity @XmlRootElement @Table(uniqueConstraints = @UniqueConstraint(columnNames = "email")) -public class Member implements Serializable -{ - private Long id; - private String name; - private String email; - private String phoneNumber; +public class Member implements Serializable { + /** Default value included to remove warning. Remove or modify at will. **/ + private static final long serialVersionUID = 1L; - @Id - @GeneratedValue - public Long getId() - { - return id; - } + private Long id; + private String name; + private String email; + private String phoneNumber; - public void setId(Long id) - { - this.id = id; - } + @Id + @GeneratedValue + public Long getId() { + return id; + } - @NotNull - @Size(min = 1, max = 25) - @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces") - public String getName() - { - return name; - } + public void setId(Long id) { + this.id = id; + } - public void setName(String name) - { - this.name = name; - } + @NotNull + @Size(min = 1, max = 25) + @Pattern(regexp = "[A-Za-z ]*", message = "must contain only letters and spaces") + public String getName() { + return name; + } - @NotNull - @NotEmpty - @Email - public String getEmail() - { - return email; - } + public void setName(String name) { + this.name = name; + } - public void setEmail(String email) - { - this.email = email; - } + @NotNull + @NotEmpty + @Email + public String getEmail() { + return email; + } - @NotNull - @Size(min = 10, max = 12) - @Digits(fraction = 0, integer = 12) - @Column(name = "phone_number") - public String getPhoneNumber() - { - return phoneNumber; - } + public void setEmail(String email) { + this.email = email; + } - public void setPhoneNumber(String phoneNumber) - { - this.phoneNumber = phoneNumber; - } - - /** Default value included to remove warning. Remove or modify at will. */ - private static final long serialVersionUID = 1L; + @NotNull + @Size(min = 10, max = 12) + @Digits(fraction = 0, integer = 12) + @Column(name = "phone_number") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } } \ No newline at end of file Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -4,14 +4,14 @@ import javax.ws.rs.core.Application; /** - * A class extending {@link Application} and annotated with @ApplicationPath - * is the Java EE 6 "no XML" approach to activating JAX-RS. - * - * <p>Resources are served relative to the servlet path specified in the {@link - * ApplicationPath} annotation.</p> + * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE 6 "no XML" approach to activating + * JAX-RS. + * + * <p> + * Resources are served relative to the servlet path specified in the {@link ApplicationPath} annotation. + * </p> */ @ApplicationPath("/rest") -public class JaxRsActivator extends Application -{ - /* class body intentionally left blank */ +public class JaxRsActivator extends Application { + /* class body intentionally left blank */ } Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/MemberResourceRESTService.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -13,31 +13,28 @@ /** * JAX-RS Example * - * This class produces a RESTful service to read the contents of the members table. + * This class produces a RESTful service to read the contents of the members table. */ @Path("/members") @RequestScoped -public class MemberResourceRESTService -{ - @Inject - @MemberRepository - private EntityManager em; +public class MemberResourceRESTService { + @Inject + @MemberRepository + private EntityManager em; - @GET - public List<Member> listAllMembers() - { - // Use @SupressWarnings to force IDE to ignore warnings about "genericizing" the results of this query - @SuppressWarnings("unchecked") - // We recommend centralizing inline queries such as this one into @NamedQuery annotations on the @Entity class - // as described in the named query blueprint: https://blueprints.dev.java.net/bpcatalog/ee5/persistence/namedquery.html - final List<Member> results = em.createQuery("select m from Member m order by m.name").getResultList(); - return results; - } + @GET + public List<Member> listAllMembers() { + // Use @SupressWarnings to force IDE to ignore warnings about "genericizing" the results of this query + @SuppressWarnings("unchecked") + // We recommend centralizing inline queries such as this one into @NamedQuery annotations on the @Entity class + // as described in the named query blueprint: https://blueprints.dev.java.net/bpcatalog/ee5/persistence/namedquery.html + final List<Member> results = em.createQuery("select m from Member m order by m.name").getResultList(); + return results; + } - @GET - @Path("/{id:[1-9][0-9]*}") - public Member lookupMemberById(@PathParam("id") long id) - { - return em.find(Member.class, id); - } + @GET + @Path("/{id:[1-9][0-9]*}") + public Member lookupMemberById(@PathParam("id") long id) { + return em.find(Member.class, id); + } } Modified: archetypes/javaee6-webapp/trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/resources/META-INF/persistence.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/resources/META-INF/persistence.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,29 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<persistence version="2.0" - 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"> - <persistence-unit name="primary"> - <!-- You can force a non-default JPA provider using one of these declarations --> - <!-- - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - --> +<persistence version="2.0" 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"> + <persistence-unit name="primary"> + <!-- You can force a non-default JPA provider using one of these declarations --> + <!-- + <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + --> - <!-- jdbc/__default is the default data source in GlassFish --> - <!-- The same data source is added to JBoss AS by deploying the project file default-ds.xml --> - <jta-data-source>jdbc/__default</jta-data-source> - <properties> - <!-- Properties for Hibernate (default provider for JBoss AS) --> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.format_sql" value="false"/> + <!-- jdbc/__default is the default data source in GlassFish --> + <!-- A matching data source is added to JBoss AS by deploying the project file default-ds.xml --> + <jta-data-source>jdbc/__default</jta-data-source> + <properties> + <!-- Properties for Hibernate (default provider for JBoss AS) --> + <property name="hibernate.hbm2ddl.auto" value="create-drop" /> + <property name="hibernate.show_sql" value="true" /> + <property name="hibernate.format_sql" value="false" /> - <!-- Properties for EclipseLink (default provider for GlassFish) --> - <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> - <property name="eclipselink.logging.level" value="FINE"/> - </properties> - </persistence-unit> -</persistence> + <!-- Properties for EclipseLink (default provider for GlassFish) --> + <property name="eclipselink.ddl-generation" value="drop-and-create-tables" /> + <property name="eclipselink.logging.level" value="FINE" /> + </properties> + </persistence-unit> +</persistence> \ No newline at end of file Modified: archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE datasources PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> <datasources> - <local-tx-datasource> - <jndi-name>jdbc/__default</jndi-name> - <use-java-context>false</use-java-context> - <connection-url>jdbc:hsqldb:.</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - <min-pool-size>5</min-pool-size> - <max-pool-size>20</max-pool-size> - </local-tx-datasource> + <!-- Installs an in-memory data source on JBoss AS having the same name as the default data source in GlassFish --> + <local-tx-datasource> + <jndi-name>jdbc/__default</jndi-name> + <use-java-context>false</use-java-context> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + </local-tx-datasource> </datasources> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/META-INF/context.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/META-INF/context.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/META-INF/context.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -2,6 +2,6 @@ <!-- This optional file is used by JBoss AS to get around an issue involving serialization of sessions between container restarts --> <!-- This file can be removed if you're using other containers, like Glassfish --> <Context> - <!-- disable storage of sessions across restarts by setting the pathname to an empty value --> - <Manager pathname=""/> + <!-- disable storage of sessions across restarts by setting the pathname to an empty value --> + <Manager pathname=""/> </Context> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/beans.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/beans.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/beans.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -2,7 +2,7 @@ <!-- This file can be an empty text file (0 bytes) --> <!-- We're declaring the schema to save you time if you do have to configure this in the future --> <beans 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/beans_1_0.xsd"> + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> </beans> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This file is not required if you don't need any extra configuration. --> <faces-config version="2.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-facesconfig_2_0.xsd"> + 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-facesconfig_2_0.xsd"> - <!-- This descriptor activates the JSF 2.0 Servlet --> + <!-- This descriptor activates the JSF 2.0 Servlet --> - <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. --> + <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. --> </faces-config> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,63 +1,61 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets"> - <h:head> - <title>Java EE 6 Starter Application</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <h:outputStylesheet name="css/screen.css"/> - </h:head> - <h:body> - <div id="container"> - <div id="content"> - <div id="sidebar"> - <h3>Find out more</h3> - <p> - Learn about the Java EE 6 platform and the component model it provides. - </p> - <ul> - <li><a href="http://download.oracle.com/javaee/6/tutorial/doc">Java EE 6 tutorial</a></li> - <li><a href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299: CDI specification</a></li> - <li><a href="https://sites.google.com/site/cdipojo/get-started">CDI Source</a></li> - </ul> - <p> - Dive into Weld, the JSR-299 reference implementation, and discover portable extensions Seam 3 offers. - </p> - <ul> - <li><a href="http://docs.jboss.org/weld/reference/latest/en-US/html"&g... reference guide</a></li> - <li><a href="http://seamframework.org/Weld">Weld project</a></li> - <li><a href="http://seamframework.org/Seam3">Seam 3 project</a></li> - <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> - <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> - <li><a href="https://issues.jboss.org/browse/WELDRAD">Archetype issue tracker</a></li> - </ul> - <p> - Explore JavaServer Faces, the component-oriented UI framework in Java EE 6. - </p> - <ul> - <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> - </ul> - <p> - If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and - consider <a href="http://seamframework.org/Seam3/GetInvolved">contributi... it back to the - community! - </p> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:head> + <title>Java EE 6 Starter Application</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <h:outputStylesheet name="css/screen.css"/> + </h:head> + <h:body> + <div id="container"> + <div id="content"> + <div id="sidebar"> + <h3>Find out more</h3> + <p> + Learn about the Java EE 6 platform and the component model it provides. + </p> + <ul> + <li><a href="http://download.oracle.com/javaee/6/tutorial/doc">Java EE 6 tutorial</a></li> + <li><a href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299: CDI specification</a></li> + <li><a href="https://sites.google.com/site/cdipojo/get-started">CDI Source</a></li> + </ul> + <p> + Dive into Weld, the JSR-299 reference implementation, and discover portable extensions Seam 3 offers. + </p> + <ul> + <li><a href="http://docs.jboss.org/weld/reference/latest/en-US/html"&g... reference guide</a></li> + <li><a href="http://seamframework.org/Weld">Weld project</a></li> + <li><a href="http://seamframework.org/Seam3">Seam 3 project</a></li> + <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> + <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> + <li><a href="https://issues.jboss.org/browse/WELDRAD">Archetype issue tracker</a></li> + </ul> + <p> + Explore JavaServer Faces, the component-oriented UI framework in Java EE 6. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> + If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and + consider <a href="http://seamframework.org/Seam3/GetInvolved">contributi... it back to the + community! + </p> + </div> + <ui:insert name="content"> + [Template content will be inserted here] + </ui:insert> </div> - <ui:insert name="content"> - [Template content will be inserted here] - </ui:insert> - </div> - <div id="footer"> - <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> - <p> - This project was generated from a Maven archetype maintained by the Weld team.<br/> - Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/> - <a - href="http://localhost:8080/jmx-console/HtmlAdaptor?action=inspectMBean&amp;name=java.util.logging%3Atype%3DLogging">Tune - logging levels (JBoss AS)</a> - </p> - </div> - </div> - </h:body> + <div id="footer"> + <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> + <p> + This project was generated from a Maven archetype maintained by the Weld team.<br/> + Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/> + <a href="http://localhost:8080/jmx-console/HtmlAdaptor?action=inspectMBean&amp;name=java.util.logging%3Atype%3DLogging">Adjust logging levels (JBoss AS)</a> + </p> + </div> + </div> + </h:body> </html> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,35 +1,31 @@ <?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"> + 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"> - <!-- An optional parameter that makes troubleshooting errors much easier --> - <!-- You should remove this context parameter before deploying to production! --> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> - - <!-- JSF 2.0 Servlet activates automatically when the WEB-INF/faces-config.xml descriptor is present --> + <!-- An optional parameter that makes troubleshooting errors much easier --> + <!-- You should remove this context parameter before deploying to production! --> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + + <!-- JSF 2.0 Servlet activates automatically when the WEB-INF/faces-config.xml descriptor is present --> - <!-- This section is optional. We are allowing index.jsf to handle the root URL (i.e., /). --> - <welcome-file-list> - <!-- Add additional files here, if desired, for example: <welcome-file>index.html</welcome-file> --> - <welcome-file>index.jsf</welcome-file> - </welcome-file-list> + <!-- Enable this mapping to protect your view templates from direct URL access --> + <!-- + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.xhtml</url-pattern> + </servlet-mapping> + --> - <!-- Enable this security constraint if you are using *.jsf as your Faces Servlet mapping --> - <!-- - <security-constraint> - <display-name>Restrict direct access to Facelets views</display-name> - <web-resource-collection> - <web-resource-name>Facelets views</web-resource-name> - <url-pattern>*.xhtml</url-pattern> - </web-resource-collection> - <auth-constraint/> - </security-constraint> - --> + <!-- This section is optional. We are allowing index.jsf to handle the root URL (i.e., /). --> + <welcome-file-list> + <!-- Add additional files here, if desired, for example: <welcome-file>index.html</welcome-file> --> + <welcome-file>index.jsf</welcome-file> + </welcome-file-list> </web-app> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/index.jsf =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/index.jsf 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/index.jsf 2011-03-31 23:05:46 UTC (rev 7220) @@ -3,6 +3,6 @@ Having this file is a trick to get JBoss AS to redirect to the path index.jsf when the root application URL is requested (or any subdirectory). -See https://jira.jboss.org/browse/JBAS-8224 +See https://issues.jboss.org/browse/JBAS-8224 -If you are using other containers, such as Glassfish, this file will be ignored and you may delete at will. \ No newline at end of file +If you are using other containers, such as Glassfish, this file will be ignored and you may delete at will. Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/index.xhtml =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/index.xhtml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/index.xhtml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,79 +1,79 @@ <?xml version="1.0" encoding="UTF-8"?> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="/WEB-INF/templates/default.xhtml"> - <ui:define name="content"> - <h1>Welcome to Java EE 6!</h1> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="/WEB-INF/templates/default.xhtml"> + <ui:define name="content"> + <h1>Welcome to Java EE 6!</h1> - <p>You have successfully deployed a Java EE 6 web application.</p> + <p>You have successfully deployed a Java EE 6 web application.</p> - <h:form id="reg"> - <h2>Register (Bean Validation example)</h2> - <p>Enforces annotation-based constraints defined on the model class.</p> - <table> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="name" value="Name:"/> - </th> - <td> - <h:inputText id="name" value="#{newMember.name}"/> - <h:message for="name" errorClass="invalid"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="email" value="Email:"/> - </th> - <td> - <h:inputText id="email" value="#{newMember.email}"/> - <h:message for="email" errorClass="invalid"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="phoneNumber" value="Phone #:"/> - </th> - <td> - <h:inputText id="phoneNumber" value="#{newMember.phoneNumber}"/> - <h:message for="phoneNumber" errorClass="invalid"/> - </td> - </tr> - </table> - <p> - <h:commandButton id="register" action="#{memberRegistration.register}" value="Register"/> - <h:outputText value=" Registered!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> - </p> - </h:form> - <h2>Members</h2> - <h:panelGroup rendered="#{empty members}"> - <em>No registered members.</em> - </h:panelGroup> - <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}"> - <h:column> - <f:facet name="header">Id</f:facet> - #{_member.id} - </h:column> - <h:column> - <f:facet name="header">Name</f:facet> - #{_member.name} - </h:column> - <h:column> - <f:facet name="header">Email</f:facet> - #{_member.email} - </h:column> - <h:column> - <f:facet name="header">Phone #</f:facet> - #{_member.phoneNumber} - </h:column> - <h:column> - <f:facet name="header">REST URL</f:facet> - <a href="#{request.contextPath}/rest/members/#{_member.id}">/rest/members/#{_member.id}</a> - </h:column> - <f:facet name="footer"> - REST URL for all members: <a href="#{request.contextPath}/rest/members">/rest/members</a> - </f:facet> - </h:dataTable> - </ui:define> + <h:form id="reg"> + <h2>Register (Bean Validation example)</h2> + <p>Enforces annotation-based constraints defined on the model class.</p> + <table> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="name" value="Name:"/> + </th> + <td> + <h:inputText id="name" value="#{newMember.name}"/> + <h:message for="name" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="email" value="Email:"/> + </th> + <td> + <h:inputText id="email" value="#{newMember.email}"/> + <h:message for="email" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="phoneNumber" value="Phone #:"/> + </th> + <td> + <h:inputText id="phoneNumber" value="#{newMember.phoneNumber}"/> + <h:message for="phoneNumber" errorClass="invalid"/> + </td> + </tr> + </table> + <p> + <h:commandButton id="register" action="#{memberRegistration.register}" value="Register"/> + <h:outputText value=" Registered!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> + </p> + </h:form> + <h2>Members</h2> + <h:panelGroup rendered="#{empty members}"> + <em>No registered members.</em> + </h:panelGroup> + <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}"> + <h:column> + <f:facet name="header">Id</f:facet> + #{_member.id} + </h:column> + <h:column> + <f:facet name="header">Name</f:facet> + #{_member.name} + </h:column> + <h:column> + <f:facet name="header">Email</f:facet> + #{_member.email} + </h:column> + <h:column> + <f:facet name="header">Phone #</f:facet> + #{_member.phoneNumber} + </h:column> + <h:column> + <f:facet name="header">REST URL</f:facet> + <a href="#{request.contextPath}/rest/members/#{_member.id}">/rest/members/#{_member.id}</a> + </h:column> + <f:facet name="footer"> + REST URL for all members: <a href="#{request.contextPath}/rest/members">/rest/members</a> + </f:facet> + </h:dataTable> + </ui:define> </ui:composition> Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/resources/css/screen.css =================================================================== --- archetypes/javaee6-webapp/trunk/src/main/webapp/resources/css/screen.css 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/main/webapp/resources/css/screen.css 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,40 +1,40 @@ body { - margin: 0; - padding: 0; - background-color: #EAECEE; - font-family: Verdana, sans-serif; - font-size: 0.9em; + margin: 0; + padding: 0; + background-color: #EAECEE; + font-family: Verdana, sans-serif; + font-size: 0.9em; } #container { - margin: 0 auto; - padding: 0 20px 10px 20px; - border: 1px solid #666666; - width: 865px; /* subtract 40px from banner width for padding */ - background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat; - padding-top: 110px; + margin: 0 auto; + padding: 0 20px 10px 20px; + border: 1px solid #666666; + width: 865px; /* subtract 40px from banner width for padding */ + background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat; + padding-top: 110px; } #sidebar { - font-size: 0.9em; - width: 225px; - float: right; - border: 1px solid #666666; - background: #EAECEE; - padding: 0 15px 5px 15px; + font-size: 0.9em; + width: 225px; + float: right; + border: 1px solid #666666; + background: #EAECEE; + padding: 0 15px 5px 15px; } #sidebar ul { - padding-left: 30px; + padding-left: 30px; } #footer { - clear: both; - text-align: center; - color: #666666; - font-size: 0.85em; - padding: 3em 0 0 0; + clear: both; + text-align: center; + color: #666666; + font-size: 0.85em; + padding: 3em 0 0 0; } code { - font-size: 1.1em; + font-size: 1.1em; } span.invalid { - padding-left: 3px; - color: red; + padding-left: 3px; + color: red; } Modified: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -3,29 +3,32 @@ import java.io.File; /** - * A temporary resolver that converts a Maven artifact reference - * into a {@link java.io.File} object. + * A temporary resolver that converts a Maven artifact reference into a {@link java.io.File} object. * - * <p>This approach is an interim solution for Maven projects - * until the open feature request to add formally add artifacts - * to a test (<a href="https://jira.jboss.org/browse/ARQ-66">ARQ-66</a>) is implementated.</p> - * - * <p>The testCompile goal will resolve any test dependencies and - * put them in your local Maven repository. By the time the test - * executes, you can be sure that the JAR files you need will be - * in your local repository.</p> - * - * <p>Example usage:</p> + * <p> + * This approach is an interim solution for Maven projects until the open feature request to add formally add artifacts to a + * test (<a href="https://jira.jboss.org/browse/ARQ-66">ARQ-66</a>) is implementated. + * </p> * + * <p> + * The testCompile goal will resolve any test dependencies and put them in your local Maven repository. By the time the test + * executes, you can be sure that the JAR files you need will be in your local repository. + * </p> + * + * <p> + * Example usage: + * </p> + * * <pre> - * WebArchive war = ShrinkWrap.create("test.war", WebArchive.class) - * .addLibrary(MavenArtifactResolver.resolve("commons-lang:commons-lang:2.5")); + * WebArchive war = ShrinkWrap.create(&quot;test.war&quot;, WebArchive.class).addLibrary( + * MavenArtifactResolver.resolve(&quot;commons-lang:commons-lang:2.5&quot;)); * </pre> - - * <p>If you are using an alternate local Maven repository, you need to pass it - * to the Maven surefire plugin using the following stanza in the plugin - * configuration element:</p> - * + * + * <p> + * If you are using an alternate local Maven repository, you need to pass it to the Maven surefire plugin using the following + * stanza in the plugin configuration element: + * </p> + * * <pre> * &lt;systemProperties&gt; * &lt;property&gt; @@ -34,58 +37,45 @@ * &lt;/property&gt; * &lt;/systemProperties&gt; * </pre> - * - * <p>Another approach to pull in a library is to add packages recursively from the - * root library package.</p> - * + * + * <p> + * Another approach to pull in a library is to add packages recursively from the root library package. + * </p> + * * @author Dan Allen */ -public class MavenArtifactResolver -{ - private static final String LOCAL_MAVEN_REPO = - System.getProperty("maven.repo.local") != null ? System.getProperty("maven.repo.local") : - (System.getProperty("user.home") + File.separatorChar + - ".m2" + File.separatorChar + "repository"); +public class MavenArtifactResolver { + private static final String LOCAL_MAVEN_REPO = System.getProperty("maven.repo.local") != null ? System + .getProperty("maven.repo.local") : (System.getProperty("user.home") + File.separatorChar + ".m2" + + File.separatorChar + "repository"); - public static File resolve(final String groupId, final String artifactId, final String version) - { - return resolve(groupId, artifactId, version, null); - } + public static File resolve(final String groupId, final String artifactId, final String version) { + return resolve(groupId, artifactId, version, null); + } - public static File resolve(final String groupId, final String artifactId, - final String version, final String classifier) - { - return new File(LOCAL_MAVEN_REPO + File.separatorChar + - groupId.replace(".", File.separator) + File.separatorChar + - artifactId + File.separatorChar + - version + File.separatorChar + - artifactId + "-" + version + - (classifier != null ? ("-" + classifier) : "") + ".jar"); - } + public static File resolve(final String groupId, final String artifactId, final String version, final String classifier) { + return new File(LOCAL_MAVEN_REPO + File.separatorChar + groupId.replace(".", File.separator) + File.separatorChar + + artifactId + File.separatorChar + version + File.separatorChar + artifactId + "-" + version + + (classifier != null ? ("-" + classifier) : "") + ".jar"); + } - public static File resolve(final String qualifiedArtifactId) - { - String[] segments = qualifiedArtifactId.split(":"); - if (segments.length == 3) - { - return resolve(segments[0], segments[1], segments[2]); - } - else if (segments.length == 4) - { - return resolve(segments[0], segments[1], segments[2], segments[3]); - } - throw new IllegalArgumentException("Invalid format for qualified artifactId: " + qualifiedArtifactId); - } + public static File resolve(final String qualifiedArtifactId) { + String[] segments = qualifiedArtifactId.split(":"); + if (segments.length == 3) { + return resolve(segments[0], segments[1], segments[2]); + } else if (segments.length == 4) { + return resolve(segments[0], segments[1], segments[2], segments[3]); + } + throw new IllegalArgumentException("Invalid format for qualified artifactId: " + qualifiedArtifactId); + } - public static File[] resolveAll(final String... qualifiedArtifactIds) - { - int n = qualifiedArtifactIds.length; - File[] artifacts = new File[n]; - for (int i = 0; i < n; i++) - { - artifacts[i] = resolve(qualifiedArtifactIds[i]); - } + public static File[] resolveAll(final String... qualifiedArtifactIds) { + int n = qualifiedArtifactIds.length; + File[] artifacts = new File[n]; + for (int i = 0; i < n; i++) { + artifacts[i] = resolve(qualifiedArtifactIds[i]); + } - return artifacts; - } + return artifacts; + } } Modified: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2011-03-31 23:05:46 UTC (rev 7220) @@ -22,36 +22,35 @@ import com.mycompany.model.Member; @RunWith(Arquillian.class) -public class MemberRegistrationTest -{ - @Deployment - public static Archive<?> createTestArchive() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) - // addAsManifestResource is incorrectly targeting /META-INF - .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); - } +public class MemberRegistrationTest { + @Deployment + public static Archive<?> createTestArchive() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class) + // addAsManifestResource is incorrectly targeting /META-INF + .addAsResource("test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); + } - @Inject MemberRegistration memberRegistration; + @Inject + MemberRegistration memberRegistration; - @Inject Logger log; + @Inject + Logger log; - @Test - public void testRegister() throws Exception - { - Member newMember = memberRegistration.getNewMember(); - newMember.setName("Jane Doe"); - newMember.setEmail(&quot;jane(a)mailinator.com&quot;); - newMember.setPhoneNumber("2125551234"); - memberRegistration.register(); - assertNotNull(newMember.getId()); - log.info(newMember.getName() + " was persisted with id " + newMember.getId()); - } + @Test + public void testRegister() throws Exception { + Member newMember = memberRegistration.getNewMember(); + newMember.setName("Jane Doe"); + newMember.setEmail(&quot;jane(a)mailinator.com&quot;); + newMember.setPhoneNumber("2125551234"); + memberRegistration.register(); + assertNotNull(newMember.getId()); + log.info(newMember.getName() + " was persisted with id " + newMember.getId()); + } - @Produces - public Logger produceLog(InjectionPoint injectionPoint) - { - return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()); - } + @Produces + public Logger produceLog(InjectionPoint injectionPoint) { + return Logger.getLogger(injectionPoint.getMember().getDeclaringClass()); + } } Modified: archetypes/javaee6-webapp/trunk/src/test/resources/arquillian.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/resources/arquillian.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/resources/arquillian.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<arquillian xmlns="http://jboss.com/arquillian" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:jbossas-remote="urn:arq:org.jboss.arquillian.container.jbossas.remote_6" - xmlns:glassfish-embedded="urn:arq:org.jboss.arquillian.container.glassfish.embedded_3"> +<arquillian xmlns="http://jboss.com/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://jboss.org/schema/arquillian + http://jboss.org/schema/arquillian/arquillian-1.0.xsd"> <!-- Uncomment to have test archives exported to the file system for inspection --> <!-- <engine> - <deploymentExportPath>target/</deploymentExportPath> + <property name="deploymentExportPath">target/</property> </engine> --> + <!-- Example configuration for a remote JBoss AS instance --> + <container qualifier="jbossas-remote" default="true"> + <property name="httpPort">8080</property> + </container> + <!-- Required configuration for an embedded GlassFish instance --> - <glassfish-embedded:container> - <glassfish-embedded:bindHttpPort>7070</glassfish-embedded:bindHttpPort> - <glassfish-embedded:sunResourcesXml>src/test/resources-glassfish-embedded/sun-resources.xml</glassfish-embedded:sunResourcesXml> - </glassfish-embedded:container> + <container qualifier="glassfish-embedded"> + <property name="bindHttpPort">7070</property> + <property name="sunResourcesXml">src/test/resources-glassfish-embedded/sun-resources.xml</property> + </container> - <!-- Example configuration for a remote JBoss AS instance --> - <jbossas-remote:container> - <jbossas-remote:remoteServerHttpPort>8080</jbossas-remote:remoteServerHttpPort> - </jbossas-remote:container> - -</arquillian> +</arquillian> \ No newline at end of file Modified: archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/sun-resources.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/sun-resources.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/sun-resources.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE resources PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Resource Definitions //EN" - "http://www.sun.com/software/appserver/dtds/sun-resources_1_4.dtd"> + "http://www.sun.com/software/appserver/dtds/sun-resources_1_4.dtd"> <resources> - <jdbc-resource pool-name="ArquillianEmbeddedDerbyPool" - jndi-name="jdbc/arquillian"/> - <jdbc-connection-pool name="ArquillianEmbeddedDerbyPool" - res-type="javax.sql.DataSource" - datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource" - is-isolation-level-guaranteed="false"> - <property name="databaseName" value="target/databases/derby"/> - <property name="createDatabase" value="create"/> - </jdbc-connection-pool> + <jdbc-resource pool-name="ArquillianEmbeddedDerbyPool" + jndi-name="jdbc/arquillian"/> + <jdbc-connection-pool name="ArquillianEmbeddedDerbyPool" + res-type="javax.sql.DataSource" + datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource" + is-isolation-level-guaranteed="false"> + <property name="databaseName" value="target/databases/derby"/> + <property name="createDatabase" value="create"/> + </jdbc-connection-pool> </resources> Modified: archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/test-persistence.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/test-persistence.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/resources-glassfish-embedded/test-persistence.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <persistence version="2.0" - 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"> - <persistence-unit name="primary"> - <jta-data-source>jdbc/arquillian</jta-data-source> - <properties> - <!-- Properties for EclipseLink (default provider for GlassFish) --> - <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> - <property name="eclipselink.logging.level" value="FINE"/> - </properties> - </persistence-unit> + 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"> + <persistence-unit name="primary"> + <jta-data-source>jdbc/arquillian</jta-data-source> + <properties> + <!-- Properties for EclipseLink (default provider for GlassFish) --> + <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> + <property name="eclipselink.logging.level" value="FINE"/> + </properties> + </persistence-unit> </persistence> Modified: archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/test-persistence.xml =================================================================== --- archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/test-persistence.xml 2011-03-31 22:08:50 UTC (rev 7219) +++ archetypes/javaee6-webapp/trunk/src/test/resources-jbossas/test-persistence.xml 2011-03-31 23:05:46 UTC (rev 7220) @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<persistence version="2.0" - 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"> - <persistence-unit name="primary"> - <jta-data-source>java:/DefaultDS</jta-data-source> - <properties> - <!-- Properties for Hibernate (default provider for JBoss AS) --> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.format_sql" value="false"/> - </properties> - </persistence-unit> +<persistence version="2.0" 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"> + <persistence-unit name="primary"> + <jta-data-source>java:/DefaultDS</jta-data-source> + <properties> + <!-- Properties for Hibernate (default provider for JBoss AS) --> + <property name="hibernate.hbm2ddl.auto" value="create-drop" /> + <property name="hibernate.show_sql" value="true" /> + <property name="hibernate.format_sql" value="false" /> + </properties> + </persistence-unit> </persistence>