Weld SVN: r7191 - in archetypes/jsf-weld-servlet-webapp/tags: 1.0.1.Beta1 and 25 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-21 15:44:12 -0500 (Fri, 21 Jan 2011)
New Revision: 7191
Added:
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/pom.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/MemberResourceRESTService.java
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/BeanManagerTest.java
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties
archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/goal.txt
Log:
prepare for 1.0.1.Beta1 release
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/pom.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/pom.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,96 @@
+<?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>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>17</version>
+ </parent>
+
+ <groupId>org.jboss.weld.archetypes</groupId>
+ <artifactId>jboss-jsf-weld-servlet-webapp</artifactId>
+ <version>1.0.1.Beta1</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>JBoss JSF and CDI Servlet Webapp</name>
+
+ <description>An archetype that generates a starter JSF webapp project with CDI capabilities for Servlet containers</description>
+
+ <url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <roles>
+ <role>Weld archetypes co-lead</role>
+ </roles>
+ <email>stevenboscarine(a)gmail.com</email>
+ <organization>Community Volunteer</organization>
+ <organizationUrl>http://chip.org/</organizationUrl>
+ <url>http://www.beacon16.com/</url>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <roles>
+ <role>Weld archetypes co-lead</role>
+ </roles>
+ <email>dan.j.allen(a)gmail.com</email>
+ <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>pete.muir(a)jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ </developers>
+
+ <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>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-w...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-weba...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/jsf-weld-servlet-webapp-s...</url>
+ </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</url>
+ </repository>
+ <snapshotRepository>
+ <id>central-snapshots-repository</id>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ -->
+</project>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/META-INF/maven/archetype-metadata.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="jboss-jsf-weld-servlet-webapp-src"
+ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript..."
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <requiredProperties>
+ <requiredProperty key="name">
+ <defaultValue>JSF and CDI webapp project</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.png</include>
+ <include>**/*.xhtml</include>
+ <include>**/*.css</include>
+ <include>**/*.jsf</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.prefs</include>
+ <include>**/*.component</include>
+ <include>**/*.container</include>
+ <include>**/*.jsdtscope</include>
+ <include>**/*.name</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>archetype-pom.xml</include>
+ <include>readme.txt</include>
+ <include>release-procedure.txt</include>
+ <include>readme.html</include>
+ <include>archetype-excludes.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>.classpath</include>
+ <include>.release-procedure.txt.swp</include>
+ <include>.project</include>
+ <include>create-archetype.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/pom.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,295 @@
+<?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>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+
+ <name>${name}</name>
+ <description>A starter JSF and CDI webapp project that targets Servlet containers, generated from the jboss-jsf-weld-servlet-webapp archetype</description>
+
+ <properties>
+ <version.weld-servlet>1.1.0.Final</version.weld-servlet>
+ <version.arquillian>1.0.0.Alpha4</version.arquillian>
+ <version.mojarra>2.0.3</version.mojarra>
+ <version.myfaces>2.0.3</version.myfaces>
+
+ <!--
+ 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>
+ </properties>
+
+ <repositories>
+ <!-- The JBoss public Nexus 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>https://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository</id>
+ <name>JBoss Repository</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Import scope will provide versions for dependencies below. -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-parent</artifactId>
+ <version>${version.weld-servlet}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- Common to JEE and Servlet containers -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2.1-b04</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2.1-b04</version>
+ <scope>runtime</scope>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Bean Validation API (JSR 303) -->
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <!-- Bean Validation Implementation -->
+ <!-- Provides portable constraints such as @NotEmpty, @Email and @Url -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <!-- Compiler plugin enforces Java 1.5 compatibility -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <!-- Embedded Jetty (jetty:run) -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
+ <configuration>
+ <!-- Delete this block to have Jetty run default port (8080) -->
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>9090</port>
+ </connector>
+ </connectors>
+ <!-- force friendly name instead of artifact name + version -->
+ <contextPath>${project.build.finalName}</contextPath>
+ <!-- Where the BeanManager is constructed. This is where you'll declare datasources. -->
+ <jettyEnvXml>${project.basedir}/src/test/resources/jetty-env.xml</jettyEnvXml>
+ <!-- This parameter will auto-deploy modified classes. -->
+ <!-- You can save changes in a file or class and refresh your browser to view the changes. -->
+ <scanIntervalSeconds>3</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+
+ <!-- Embedded Tomcat (package tomcat:run) -->
+ <!-- Standalone Tomcat (package tomcat:deploy) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <path>/${project.build.finalName}</path>
+ <!-- Embedded port -->
+ <port>9090</port>
+ <!--
+ The default authentication credentials for remote deployment are username "admin" with no password To
+ override credentials, define a server in settings.xml and activate it using the <server> element
+ -->
+ <url>http://localhost:9090/manager</url>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>arq-weld-embedded</id>
+ <activation>
+ <property>
+ <name>!arquillian</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld.arquillian.container</groupId>
+ <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Arquillian Weld EE Embedded requires the EL and EJB 3.1 APIs; Weld runtime provided by weld-servlet -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <!-- remove scope if bundling EL libraries w/ webapp -->
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Reference Implementation-->
+ <id>mojarra</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.mojarra}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.mojarra}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Implementation-->
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version.myfaces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version.myfaces}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JAX-RS 1.1 Reference Implementation-->
+ <id>jersey</id>
+ <activation>
+ <property>
+ <name>!jaxrs</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- TODO add profile for RESTEasy -->
+ </profiles>
+</project>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.html 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,96 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title></title>
+<meta name="generator" content="HTML::TextToHTML v2.51"/>
+</head>
+<body>
+<h1><a name="section_1">${artifactId}</a></h1>
+<p> <strong>Source archetype:</strong> jboss-jsf-weld-servlet-webapp
+</p><h2><a name="section_1_1">What is it?</a></h2>
+<p> This is your project! It's a barebones, deployable Maven 2 project to help you
+ get your foot in the door developing with Java EE 6. Specifically, this
+ project is setup to allow you to create a JSF 2.0 and CDI 1.0 application that
+ can run on Servlet Containers like Tomcat 6 and Jetty 6. You may be satisfied
+ with this combination in the long run, or you may eventually migrate to a true
+ Java EE 6 environment to leverage EJB 3.1, JPA 2.0 and other platform
+ technologies.
+</p><h2><a name="section_1_2">System requirements</a></h2>
+<p> All you need to run this project is Java 5.0 (Java SDK 1.5) or greator and
+ Maven 2.0.10 or greater. This application is setup to be run on a Servlet
+ Container. The embedded Jetty and Tomcat containers get downloaded
+ automatically by the Maven commands.
+</p><p> If you want to deploy the application to a standalone Servlet Container, then
+ you will need to set one up.
+</p><p> Please note that Maven 2 project needs to use the JBoss Maven repository
+ because there are certain Java EE API JARs that are not yet publised to the
+ Maven Central Repository (see <a href="https://jira.jboss.org/jira/browse/WELD-222">https://jira.jboss.org/jira/browse/WELD-222</a>)
+</p><h2><a name="section_1_3">Deploying the application</a></h2>
+<p> You can deploy the application without moving any files around using the
+ embedded Jetty or Tomcat containers.
+</p><p> To run the application using embedded Jetty, execute this command:
+</p><pre>
+ mvn jetty:run</pre>
+<p> To run the application using embedded Tomcat, execute this command:
+</p><pre>
+ mvn compile tomcat:run</pre>
+<p> The application will be running at the following URL:
+
+</p><pre>
+ <a href="http://localhost:9090/${artifactId}">http://localhost:9090/${artifactId}</a></pre>
+<p> To run the application on a standalone container, first execute this command:
+</p><pre>
+ mvn package</pre>
+<p> Then copy the archive target/jboss-jsf-weld-servlet-webapp.war to the hot deploy directory of
+ the container (e.g., the webapps directory of Tomcat). Of course, you also
+ need to start the container.
+</p><p> The default settings use Mojarra 2, the JSF 2 reference implementation. If you
+ want to use MyFaces 2 instead, just add the -Djsf=myfaces flag to any of the
+ commands above.
+</p><pre>
+ mvn jetty:run -Djsf=myfaces</pre>
+<p> The application will work just as before, except the JSF functionality will be
+ powered by MyFaces.
+</p><h2><a name="section_1_4">Importing the project into an IDE</a></h2>
+<p> If you created the project using the Maven 2 archetype wizard in your IDE
+ (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should
+ already have an IDE project.
+</p><p> If you created the project from the commandline using archetype:generate, then
+ you need to bring the project into your IDE. If you are using NetBeans 6.8 or
+ IntelliJ IDEA 9, then all you have to do is open the project as an existing
+ project. Both of these IDEs recognize Maven 2 projects natively.
+</p><p> To import into Eclipse, you first need to install the m2eclipse plugin. To get
+ started, add the m2eclipse update site (<a href="http://m2eclipse.sonatype.org/update/">http://m2eclipse.sonatype.org/update/</a>)
+ to Eclipse and install the m2eclipse plugin and required dependencies. Once
+ that is installed, you'll be ready to import the project into Eclipse.
+</p><pre>
+ Select File > Import... and select "Import... > Maven Projects" and select
+</pre>
+<p> your project directory. m2eclipse should take it from there.
+</p><p> Once in the IDE, you can execute the Maven commands through the IDE controls
+ to run the application on an embedded Servlet Container.
+</p><h2><a name="section_1_5">Downloading the sources and Javadocs</a></h2>
+<p> If you want to be able to debug into the source code or look at the Javadocs
+ of any library in the project, you can run either of the following two
+ commands to pull them into your local repository. The IDE should then detect
+ them.
+</p><pre>
+ mvn dependency:sources
+ mvn dependency:resolve -Dclassifier=javadoc</pre>
+<h2><a name="section_1_6">Resources</a></h2>
+<p> Weld archetypes:
+</p><ul>
+ <li>Quickstart: <a href="http://seamframework.org/Documentation/WeldQuickstartForMavenUsers">http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</a>
+ </li><li>Issue tracker: <a href="https://jira.jboss.org/jira/browse/WELDRAD">https://jira.jboss.org/jira/browse/WELDRAD</a>
+ </li><li>Source code: <a href="http://anonsvn.jboss.org/repos/weld/archetypes">http://anonsvn.jboss.org/repos/weld/archetypes</a>
+ </li><li>Forums: <a href="http://seamframework.org/Community/WeldUsers">http://seamframework.org/Community/WeldUsers</a>
+ JSR-299 overview: <a href="http://seamframework.org/Weld">http://seamframework.org/Weld</a>
+ JSF community site: <a href="http://www.javaserverfaces.org">http://www.javaserverfaces.org</a>
+</li></ul>
+
+</body>
+</html>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/readme.txt 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,113 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+ ${artifactId}
+ +++++++++++++++++++++++++++++++++
+
+ ${symbol_pound}Source archetype:${symbol_pound} jboss-jsf-weld-servlet-webapp
+
+ What is it?
+ ===========
+
+ This is your project! It's a barebones, deployable Maven 2 project to help you
+ get your foot in the door developing with Java EE 6. Specifically, this
+ project is setup to allow you to create a JSF 2.0 and CDI 1.0 application that
+ can run on Servlet Containers like Tomcat 6 and Jetty 6. You may be satisfied
+ with this combination in the long run, or you may eventually migrate to a true
+ Java EE 6 environment to leverage EJB 3.1, JPA 2.0 and other platform
+ technologies.
+
+ System requirements
+ ===================
+
+ All you need to run this project is Java 5.0 (Java SDK 1.5) or greator and
+ Maven 2.0.10 or greater. This application is setup to be run on a Servlet
+ Container. The embedded Jetty and Tomcat containers get downloaded
+ automatically by the Maven commands.
+
+ If you want to deploy the application to a standalone Servlet Container, then
+ you will need to set one up.
+
+ Please note that Maven 2 project needs to use the JBoss Maven repository
+ because there are certain Java EE API JARs that are not yet publised to the
+ Maven Central Repository (see https://jira.jboss.org/jira/browse/WELD-222)
+
+ Deploying the application
+ =========================
+
+ You can deploy the application without moving any files around using the
+ embedded Jetty or Tomcat containers.
+
+ To run the application using embedded Jetty, execute this command:
+
+ mvn jetty:run
+
+ To run the application using embedded Tomcat, execute this command:
+
+ mvn compile tomcat:run
+
+ The application will be running at the following URL:
+
+ http://localhost:9090/${artifactId}
+
+ To run the application on a standalone container, first execute this command:
+
+ mvn package
+
+ Then copy the archive target/jboss-jsf-weld-servlet-webapp.war to the hot deploy directory of
+ the container (e.g., the webapps directory of Tomcat). Of course, you also
+ need to start the container.
+
+ The default settings use Mojarra 2, the JSF 2 reference implementation. If you
+ want to use MyFaces 2 instead, just add the -Djsf=myfaces flag to any of the
+ commands above.
+
+ mvn jetty:run -Djsf=myfaces
+
+ The application will work just as before, except the JSF functionality will be
+ powered by MyFaces.
+
+ Importing the project into an IDE
+ =================================
+
+ If you created the project using the Maven 2 archetype wizard in your IDE
+ (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should
+ already have an IDE project.
+
+ If you created the project from the commandline using archetype:generate, then
+ you need to bring the project into your IDE. If you are using NetBeans 6.8 or
+ IntelliJ IDEA 9, then all you have to do is open the project as an existing
+ project. Both of these IDEs recognize Maven 2 projects natively.
+
+ To import into Eclipse, you first need to install the m2eclipse plugin. To get
+ started, add the m2eclipse update site (http://m2eclipse.sonatype.org/update/)
+ to Eclipse and install the m2eclipse plugin and required dependencies. Once
+ that is installed, you'll be ready to import the project into Eclipse.
+
+ Select File > Import... and select "Import... > Maven Projects" and select
+ your project directory. m2eclipse should take it from there.
+
+ Once in the IDE, you can execute the Maven commands through the IDE controls
+ to run the application on an embedded Servlet Container.
+
+ Downloading the sources and Javadocs
+ ====================================
+
+ If you want to be able to debug into the source code or look at the Javadocs
+ of any library in the project, you can run either of the following two
+ commands to pull them into your local repository. The IDE should then detect
+ them.
+
+ mvn dependency:sources
+ mvn dependency:resolve -Dclassifier=javadoc
+
+ Resources
+ =========
+
+ Weld archetypes:
+ - Quickstart: http://seamframework.org/Documentation/WeldQuickstartForMavenUsers
+ - Issue tracker: https://jira.jboss.org/jira/browse/WELDRAD
+ - Source code: http://anonsvn.jboss.org/repos/weld/archetypes
+ - Forums: http://seamframework.org/Community/WeldUsers
+ JSR-299 overview: http://seamframework.org/Weld
+ JSF community site: http://www.javaserverfaces.org
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/HelloWorld.java 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,77 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package};
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Model;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+public @Model class HelloWorld
+{
+ private final String text = "Hello, World!";
+
+ private String letters;
+
+ private String numbers;
+
+ private String email;
+
+ public HelloWorld() {}
+
+ @PostConstruct
+ public void initialize()
+ {
+ System.out.println(this.getClass().getSimpleName() + " was constructed");
+ }
+
+ public String getText()
+ {
+ return text;
+ }
+
+ @NotNull
+ @NotEmpty
+ @Pattern(regexp = "[A-Za-z]*", message = "must contain only letters")
+ public String getLetters()
+ {
+ return letters;
+ }
+
+ public void setLetters(String letters)
+ {
+ this.letters = letters;
+ }
+
+ @NotNull
+ @NotEmpty
+ @Digits(fraction = 0, integer = 2)
+ public String getNumbers()
+ {
+ return numbers;
+ }
+
+ public void setNumbers(String numbers)
+ {
+ this.numbers = numbers;
+ }
+
+ @NotNull
+ @NotEmpty
+ @Email
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+}
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/MemberResourceRESTService.java
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/MemberResourceRESTService.java (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/java/MemberResourceRESTService.java 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,22 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package};
+
+import javax.enterprise.context.RequestScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/members")
+@RequestScoped
+public class MemberResourceRESTService
+{
+ //placeholder to confirm JAX-RS is working as expected.
+ @GET
+ @Produces("text/plain")
+ public String ping()
+ {
+ return "Hello World";
+ }
+}
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,14 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file is permitted to be empty.
+ The schema definition is provided for your convenience.
+-->
+<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">
+</beans>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,11 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+ <!-- disable storage of sessions across restarts -->
+ <Manager pathname=""/>
+ <Resource name="BeanManager" auth="Container" type="javax.enterprise.inject.spi.BeanManager" factory="org.jboss.weld.resources.ManagerObjectFactory"/>
+ <!-- Uncomment to enable injection into Servlets, Servlet Listeners and Filters in Tomcat -->
+ <!-- <Listener className="org.jboss.weld.environment.tomcat.WeldLifecycleListener"/> -->
+</Context>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,14 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file is permitted to be empty.
+ The schema definition is provided for your convenience.
+-->
+<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">
+</beans>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,15 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?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">
+
+ <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. -->
+
+</faces-config>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,10 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
+ <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
+ <Arg><Ref id="webAppCtx"/></Arg>
+ </Call>
+</Configure>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "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>CDI and JSF 2 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 CDI programming model.
+ </p>
+ <ul>
+ <li><a href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299: CDI specification</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">Weld 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">contributing</a> it back to the
+ community!
+ </p>
+ </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/>
+ </p>
+ </div>
+ </div>
+ </h:body>
+</html>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,93 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" 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_2_5.xsd">
+
+ <!-- This is an optional parameter, but it 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>
+
+ <context-param>
+ <param-name>org.apache.myfaces.annotation.SCAN_PACKAGES</param-name>
+ <param-value>${package}</param-value>
+ </context-param>
+
+ <!--
+ <context-param>
+ <param-name>com.sun.faces.expressionFactory</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+ -->
+
+ <!-- Activate the JSF 2.0 servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Tell the context which URLs to process with JSF -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <!-- 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>
+
+ <!-- Weld Jetty/Tomcat specific configuration parameters -->
+ <!-- *** The <listener> and <resource-env-ref> elements can be deleted when running in a Java EE 6 container *** -->
+ <listener>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
+ </listener>
+
+ <!-- JAX-RS 1.1 configuration through Jersey -->
+ <servlet>
+ <servlet-name>Jersey Web Application</servlet-name>
+ <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+ <init-param>
+ <param-name>com.sun.jersey.config.property.packages</param-name>
+ <param-value>${package}</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Jersey Web Application</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
+ </servlet-mapping>
+ <!-- End Jersey JAX-RS configuration -->
+
+ <resource-env-ref>
+ <description>Object factory for the CDI Bean Manager</description>
+ <resource-env-ref-name>BeanManager</resource-env-ref-name>
+ <resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type>
+ </resource-env-ref>
+
+ <!-- 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>
+ -->
+</web-app>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.jsf 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,8 @@
+The contents of this file will not be displayed!
+
+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
+
+If you are using other containers, such as Glassfish, this file will be ignored and you may delete at will.
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,49 @@
+<?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>Hello World!</h1>
+ <p>Your CDI bean <code>HelloWorld</code> says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p>
+
+ <h:form id="bv">
+ <h2>Bean Validation examples</h2>
+ <p>Enforces annotation-based constraints defined on the model class.</p>
+ <table>
+ <tr>
+ <th style="text-align: right;">
+ <h:outputLabel for="letters" value="Letters:"/>
+ </th>
+ <td>
+ <h:inputText id="letters" value="#{helloWorld.letters}"/>
+ <h:message for="letters" errorClass="invalid"/>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: right;">
+ <h:outputLabel for="numbers" value="Numbers:"/>
+ </th>
+ <td>
+ <h:inputText id="numbers" value="#{helloWorld.numbers}"/>
+ <h:message for="numbers" errorClass="invalid"/>
+ </td>
+ </tr>
+ <tr>
+ <th style="text-align: right;">
+ <h:outputLabel for="email" value="Email:"/>
+ </th>
+ <td>
+ <h:inputText id="email" value="#{helloWorld.email}"/>
+ <h:message for="email" errorClass="invalid"/>
+ </td>
+ </tr>
+ </table>
+ <p>
+ <h:commandButton id="check" value="Check values"/>
+ <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/>
+ </p>
+ </h:form>
+ </ui:define>
+</ui:composition>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,40 @@
+body {
+ 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;
+}
+#sidebar {
+ font-size: 0.9em;
+ width: 225px;
+ float: right;
+ border: 1px solid #666666;
+ background: #EAECEE;
+ padding: 0 15px 5px 15px;
+}
+#sidebar ul {
+ padding-left: 30px;
+}
+#footer {
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
+ padding: 3em 0 0 0;
+}
+code {
+ font-size: 1.1em;
+}
+span.invalid {
+ padding-left: 3px;
+ color: red;
+}
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
===================================================================
(Binary files differ)
Property changes on: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
===================================================================
(Binary files differ)
Property changes on: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/BeanManagerTest.java
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/BeanManagerTest.java (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/BeanManagerTest.java 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,40 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package};
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import static org.junit.Assert.*;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class BeanManagerTest
+{
+ @Deployment
+ public static Archive<?> createTestArchive()
+ {
+ return ShrinkWrap.create(JavaArchive.class)
+ .addClass(HelloWorld.class)
+ .addManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Inject BeanManager beanManager;
+
+ @Inject HelloWorld helloWorld;
+
+ @Test
+ public void testCdiBootstrap()
+ {
+ assertNotNull(beanManager);
+ assertFalse(beanManager.getBeans(BeanManager.class).isEmpty());
+ assertEquals("Hello, World!", helloWorld.getText());
+ }
+}
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,16 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package};
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class HelloWorldTest
+{
+ @Test
+ public void testGetText() {
+ HelloWorld fixture = new HelloWorld();
+ assertEquals("Hello, World!", fixture.getText());
+ }
+}
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/main/resources/archetype-resources/src/test/resources/jetty-env.xml 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,20 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
+ <New id="beanManager" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>
+ <Ref id="webAppCtx"/>
+ </Arg>
+ <Arg>BeanManager</Arg>
+ <Arg>
+ <New class="javax.naming.Reference">
+ <Arg>javax.enterprise.inject.spi.BeanManager</Arg>
+ <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg>
+ <Arg/>
+ </New>
+ </Arg>
+ </New>
+</Configure>
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties
===================================================================
--- archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/archetype.properties 2011-01-21 20:44:12 UTC (rev 7191)
@@ -0,0 +1,5 @@
+#Fri Jan 21 15:42:40 EST 2011
+version=0.1-SNAPSHOT
+name=JSF and CDI webapp project
+groupId=archetype.it
+artifactId=basic
Added: archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Beta1/src/test/resources/projects/basic/goal.txt
===================================================================
13 years, 11 months
- 1
- 0
Weld SVN: r7190 - in archetypes/jsf-weld-servlet-webapp/trunk: src/main/webapp/WEB-INF and 1 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-21 15:41:40 -0500 (Fri, 21 Jan 2011)
New Revision: 7190
Added:
archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt
archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh
archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml
Removed:
archetypes/jsf-weld-servlet-webapp/trunk/build.sh
Modified:
archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties
archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/readme.txt
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
- update build
- upgrade Weld
- upgrade Arquillian
- profiles for mojarra and myfaces
- configure for servlet injection in jetty
- use index.jsf trick
Added: archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,10 @@
+*.swp
+.classpath
+.git
+.gitignore
+.project
+.settings
+.svn
+archetype-pom.xml
+archetype-excludes.txt
+release-procedure.txt
Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>12</version>
+ <version>17</version>
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
@@ -13,9 +13,9 @@
<version>1.0.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>JBoss CDI and JSF Servlet Webapp</name>
+ <name>JBoss JSF and CDI Servlet Webapp</name>
- <description>An archetype that generates a basic JSF Servlet webapp project with CDI capabilities</description>
+ <description>An archetype that generates a starter JSF webapp project with CDI capabilities for Servlet containers</description>
<url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
@@ -73,21 +73,21 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk/jsf-weld-ser...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk/jsf-weld-servle...</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk/jsf-weld-servlet-we...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-w...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-weba...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/jsf-weld-servlet-webapp-s...</url>
</scm>
<!-- Uncomment to deploy to central -->
<!--
<distributionManagement>
<repository>
- <id>oss.sonatype.org/jboss-staging</id>
+ <id>central-releases-repository</id>
<name>Sonatype Nexus Maven Repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
- <id>oss.sonatype.org/jboss-snapshots</id>
+ <id>central-snapshots-repository</id>
<name>Sonatype Nexus Snapshot Repository</name>
<url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
</snapshotRepository>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties 2011-01-21 20:41:40 UTC (rev 7190)
@@ -4,6 +4,6 @@
# Java package of the source files; will be replaced with the ${package} expression
archetype.package=com.mycompany
archetype.languages=java
-# value of <artifactId> is converted to ${artifactId} expression in filtered files
-archetype.filteredExtensions=java,txt,html
+# value of <artifactId> element in POM is converted to ${artifactId} expression in filtered files
+archetype.filteredExtensions=java,txt,html,xml
name=JSF and CDI webapp project
Deleted: archetypes/jsf-weld-servlet-webapp/trunk/build.sh
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-21 20:41:40 UTC (rev 7190)
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# This script generates an archetype into target/archetype from the source project.
-#
-# Two optional commands can be provided (in the order listed):
-#
-# install - which will automatically install the generated archetype in the local repository
-# generate - generate a project from the archetype into target/generated-project
-#
-
-ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
-ARCHETYPE_DIR=target/archetype
-ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
-
-echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
-txt2html -pb 1 -p 2 readme.txt > readme.html
-mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
-echo Relocating generated archetype project to $ARCHETYPE_DIR...
-rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-#rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
-mvn -f $ARCHETYPE_DIR/pom.xml clean
-echo Patching generated archetype...
-# could also use col -b
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
-sed -i 's;<name>jboss-jsf-weld-servlet-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-# not sure why the finalName replacement isn't happening
-sed -i 's;<finalName>jboss-jsf-weld-servlet-webapp-src</finalName>;<finalName>${name}</finalName>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-# remove local file that NetBeans add to source project
-rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
-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
-fi
-
-if [ ! -z $1 ] && [ "$1" = "generate" ]; then
- echo Generating project from archetype...
- cd target
- mvn archetype:generate -B -DarchetypeCatalog=local \
- -DarchetypeArtifactId=jboss-jsf-weld-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \
- -DartifactId=generated-project -DgroupId=com.acme -Dversion=1.0.0-SNAPSHOT -Dname="JSF and CDI webapp project"
-fi
Copied: archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh (from rev 7189, archetypes/jsf-weld-servlet-webapp/trunk/build.sh)
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# This script generates an archetype into target/archetype from the source project.
+#
+# Two optional commands can be provided (in the order listed):
+#
+# install - which will automatically install the generated archetype in the local repository
+# generate - generate a project from the archetype into target/generated-project
+#
+
+ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
+ARCHETYPE_DIR=target/archetype
+ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
+
+echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
+if [ ! -z `which txt2html` ]; then
+ txt2html -pb 1 -p 2 readme.txt > readme.html
+else
+ 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...
+rsync -az --exclude `basename $0` --exclude-from=archetype-excludes.txt $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
+cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
+mvn -f $ARCHETYPE_DIR/pom.xml clean
+echo Patching generated archetype...
+# could also use col -b
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
+sed -i 's;<name>jboss-jsf-weld-servlet-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+# not sure why the finalName replacement isn't happening
+sed -i 's;<finalName>jboss-jsf-weld-servlet-webapp-src</finalName>;<finalName>${name}</finalName>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+# fix reference to package in web.xml
+#sed -i 's;<param-value>com.mycompany</param-value>;<param-value>${package}</param-value>;' $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/web.xml
+# fix the archetype plugin being an idiot
+find $ARCHETYPE_RESOURCES_DIR -type f -exec sed -i 's;packageInPathFormat;package;g' {} \;
+# remove local file that NetBeans add to source project
+rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
+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
+fi
+
+if [ ! -z $1 ] && [ "$1" = "generate" ]; then
+ echo Generating project from archetype...
+ cd target
+ mvn archetype:generate -B -DarchetypeCatalog=local \
+ -DarchetypeArtifactId=jboss-jsf-weld-servlet-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="JSF and CDI webapp project"
+fi
Modified: archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -11,14 +11,16 @@
<description>A starter JSF and CDI webapp project that targets Servlet containers, generated from the jboss-jsf-weld-servlet-webapp archetype</description>
<properties>
+ <version.weld-servlet>1.1.0.Final</version.weld-servlet>
+ <version.arquillian>1.0.0.Alpha4</version.arquillian>
+ <version.mojarra>2.0.3</version.mojarra>
+ <version.myfaces>2.0.3</version.myfaces>
+
<!--
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>
- <version.weld-servlet>1.1.0.Final</version.weld-servlet>
- <version.arquillian>1.0.0.Alpha4</version.arquillian>
- <version.jsf>2.0.3</version.jsf>
</properties>
<repositories>
@@ -84,75 +86,35 @@
<scope>provided</scope>
</dependency>
- <!-- JAX-RS 1.1 Reference Implementation-->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.4</version>
- </dependency>
-
-
- <!-- FIXME use profiles for Mojarra and MyFaces -->
- <!-- JSF 2.0 API -->
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf}</version>
- </dependency>
-
- <!-- Jetty/Tomcat-specific scopes and artifacts -->
-
- <!-- JSF 2.0 Implementation -->
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
- <version>${version.jsf}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
-
- <!-- SB: Perhaps this is a means of enabling EL 2.0 in tomcat? -->
- <!-- I will uncomment once I have an opportunity to test -->
- <!--
+
+ <!--
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2.1-b04</version>
+ <scope>compile</scope>
</dependency>
- -->
- <!--
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
+ <version>2.2.1-b04</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-->
- <!-- end Jetty/Tomcat-specific scopes and artifacts -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- Bean Validation API (JSR 303) -->
<dependency>
<groupId>javax.validation</groupId>
@@ -183,6 +145,7 @@
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<!-- Compiler plugin enforces Java 1.5 compatibility -->
<plugin>
@@ -198,7 +161,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.26</version>
<configuration>
<!-- Delete this block to have Jetty run default port (8080) -->
<connectors>
@@ -240,7 +203,9 @@
<profile>
<id>arq-weld-embedded</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!arquillian</name>
+ </property>
</activation>
<dependencies>
<dependency>
@@ -248,41 +213,86 @@
<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Arquillian Weld EE Embedded requires the EL and EJB 3.1 APIs; Weld runtime provided by weld-servlet -->
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <!-- remove scope if bundling EL libraries w/ webapp -->
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.0.Final</version>
<scope>test</scope>
</dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Reference Implementation-->
+ <id>mojarra</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.mojarra}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.mojarra}</version>
+ <scope>runtime</scope>
</dependency>
- <!-- JTA and EJB 3.1 APIs are temporary until we figure out what's going on w/ arquillian & weld -->
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Implementation-->
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <dependencies>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>test</scope>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version.myfaces}</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version.myfaces}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <!-- JAX-RS 1.1 Reference Implementation-->
+ <id>jersey</id>
+ <activation>
+ <property>
+ <name>!jaxrs</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- TODO add profile for RESTEasy -->
</profiles>
</project>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/readme.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/readme.txt 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/readme.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -1,8 +1,8 @@
+ jboss-jsf-weld-servlet-webapp-src
+ +++++++++++++++++++++++++++++++++
- jboss-jsf-weld-servlet-webapp-src
+ #Source archetype:# jboss-jsf-weld-servlet-webapp
- Source archetype: jboss-jsf-weld-servlet-webapp
-
What is it?
===========
@@ -55,6 +55,15 @@
the container (e.g., the webapps directory of Tomcat). Of course, you also
need to start the container.
+ The default settings use Mojarra 2, the JSF 2 reference implementation. If you
+ want to use MyFaces 2 instead, just add the -Djsf=myfaces flag to any of the
+ commands above.
+
+ mvn jetty:run -Djsf=myfaces
+
+ The application will work just as before, except the JSF functionality will be
+ powered by MyFaces.
+
Importing the project into an IDE
=================================
Added: archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,17 @@
+(Assume Q is the qualifier of the release, e.g., Beta1)
+./create-archetype.sh
+cd target/archetype
+vim pom.xml (change 1.0.1-SNAPSHOT to 1.0.1.Q)
+svn import https://svn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-webapp/tags/...
+cd -
+cd ../tags
+svn update
+cd 1.0.1.Q
+vim pom.xml (change 1.0.1.Q to 1.0.1-SNAPSHOT)
+mvn release:prepare --batch-mode -Drelease -DdevelopmentVersion=1.0.1-SNAPSHOT -DreleaseVersion=1.0.1.Q -Dtag=1.0.1.Q -DdryRun=true
+cp pom.xml.tag pom.xml
+svn commit pom.xml -m "update tag version"
+cp pom.xml.releaseBackup pom.xml
+mvn release:perform nexus:staging-close -Drelease
+svn revert pom.xml
+mvn clean
Added: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file is permitted to be empty.
+ The schema definition is provided for your convenience.
+-->
+<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">
+</beans>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -14,25 +14,31 @@
<div id="sidebar">
<h3>Find out more</h3>
<p>
- Explore JavaServer Faces.
+ Learn about the CDI programming model.
</p>
<ul>
- <li><a href="http://www.javaserverfaces.org">JSF community site</a></li>
+ <li><a href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299: CDI specification</a></li>
</ul>
<p>
- Learn more about Java EE 6 and the extensions provided by Weld and Seam.
+ Dive into Weld, the JSR-299 reference implementation, and discover portable extensions Seam 3 offers.
</p>
<ul>
- <li><a href="http://seamframework.org/Weld">Overview</a></li>
- <li><a href="http://seamframework.org">Project site</a></li>
- <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li>
+ <li><a href="http://docs.jboss.org/weld/reference/latest/en-US/html">Weld 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://jira.jboss.org/browse/WELDRAD">Issue tracker</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/Community/Contribute">contributing</a> it back to the
+ consider <a href="http://seamframework.org/Seam3/GetInvolved">contributing</a> it back to the
community!
</p>
</div>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -11,6 +11,23 @@
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.annotation.SCAN_PACKAGES</param-name>
+ <param-value>com.mycompany</param-value>
+ </context-param>
+
+ <!--
+ <context-param>
+ <param-name>com.sun.faces.expressionFactory</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+ -->
+
<!-- Activate the JSF 2.0 servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
@@ -49,7 +66,7 @@
<servlet-mapping>
<servlet-name>Jersey Web Application</servlet-name>
- <url-pattern>/REST/*</url-pattern>
+ <url-pattern>/rest/*</url-pattern>
</servlet-mapping>
<!-- End Jersey JAX-RS configuration -->
13 years, 11 months
- 1
- 0
Weld SVN: r7189 - in archetypes/jsf-weld-servlet-webapp/trunk: src/main/webapp/WEB-INF and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-20 22:53:41 -0500 (Thu, 20 Jan 2011)
New Revision: 7189
Added:
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml
Modified:
archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/build.sh
archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
- upgrade Weld
- add central dist repo
- add jetty configuration
Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
@@ -77,4 +77,20 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk/jsf-weld-servle...</developerConnection>
<url>http://fisheye.jboss.org/browse/weld/archetypes/trunk/jsf-weld-servlet-we...</url>
</scm>
+
+ <!-- Uncomment to deploy to central -->
+ <!--
+ <distributionManagement>
+ <repository>
+ <id>oss.sonatype.org/jboss-staging</id>
+ <name>Sonatype Nexus Maven Repository</name>
+ <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ -->
</project>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/build.sh
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-21 03:53:41 UTC (rev 7189)
@@ -27,6 +27,8 @@
sed -i 's;
;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
sed -i 's;<name>jboss-jsf-weld-servlet-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+# not sure why the finalName replacement isn't happening
+sed -i 's;<finalName>jboss-jsf-weld-servlet-webapp-src</finalName>;<finalName>${name}</finalName>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
# remove local file that NetBeans add to source project
rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
rm -f readme.html
Modified: archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
@@ -16,7 +16,7 @@
[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>
- <version.weld-servlet>1.0.1-Final</version.weld-servlet>
+ <version.weld-servlet>1.1.0.Final</version.weld-servlet>
<version.arquillian>1.0.0.Alpha4</version.arquillian>
<version.jsf>2.0.3</version.jsf>
</properties>
@@ -244,12 +244,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.jboss.arquillian.container</groupId>
+ <groupId>org.jboss.weld.arquillian.container</groupId>
<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
- <!-- temporary until we figure out what's going on w/ arquillian & weld
- <version>${version.arquillian}</version>
- -->
- <version>1.0.0.Alpha3</version>
<scope>test</scope>
</dependency>
<dependency>
Added: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml 2011-01-21 03:53:41 UTC (rev 7189)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
+ <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
+ <Arg><Ref id="webAppCtx"/></Arg>
+ </Call>
+</Configure>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-21 03:53:41 UTC (rev 7189)
@@ -53,12 +53,21 @@
</servlet-mapping>
<!-- End Jersey JAX-RS configuration -->
-
-
<resource-env-ref>
<description>Object factory for the CDI Bean Manager</description>
<resource-env-ref-name>BeanManager</resource-env-ref-name>
<resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type>
</resource-env-ref>
+ <!-- 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>
+ -->
</web-app>
13 years, 11 months
- 1
- 0
[weld/core] 914b1e: [WELD-833]; fix map remove
by noreply＠github.com
Branch: refs/heads/1.1
Home: https://github.com/weld/core
Commit: 914b1ecda802394f062a377d9c4be40228118edf
https://github.com/weld/core/commit/914b1ecda802394f062a377d9c4be40228118edf
Author: Ales Justin <ales.justin(a)gmail.com>
Date: 2011-01-20 (Thu, 20 Jan 2011)
Changed paths:
M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java
Log Message:
-----------
[WELD-833]; fix map remove
13 years, 11 months
- 1
- 0
[weld/core] b0af46: [WELD-833]; fix map remove
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/weld/core
Commit: b0af46d42bb111821bfa6fee5b96ca0f5ffa7158
https://github.com/weld/core/commit/b0af46d42bb111821bfa6fee5b96ca0f5ffa7158
Author: Ales Justin <ales.justin(a)gmail.com>
Date: 2011-01-20 (Thu, 20 Jan 2011)
Changed paths:
M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java
Log Message:
-----------
[WELD-833]; fix map remove
13 years, 11 months
- 1
- 0
Weld SVN: r7188 - archetypes/javaee6-webapp/tags/1.0.1.Beta2.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-20 02:50:56 -0500 (Thu, 20 Jan 2011)
New Revision: 7188
Modified:
archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
Log:
use central repo
Modified: archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml 2011-01-20 07:35:24 UTC (rev 7187)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml 2011-01-20 07:50:56 UTC (rev 7188)
@@ -77,4 +77,17 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/tags/1...</developerConnection>
<url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/tags/1.0.1...</url>
</scm>
+
+ <distributionManagement>
+ <repository>
+ <id>oss.sonatype.org/jboss-staging</id>
+ <name>Sonatype Nexus Maven Repository</name>
+ <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>Sonatype Nexus Snapshot Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
13 years, 11 months
- 1
- 0
Weld SVN: r7187 - archetypes/javaee6-webapp/tags/1.0.1.Beta2.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-20 02:35:24 -0500 (Thu, 20 Jan 2011)
New Revision: 7187
Modified:
archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
Log:
update tag version
Modified: archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml 2011-01-20 07:33:19 UTC (rev 7186)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml 2011-01-20 07:35:24 UTC (rev 7187)
@@ -73,8 +73,8 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/tag...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/tags/1...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/tags/1.0.1...</url>
</scm>
</project>
13 years, 11 months
- 1
- 0
Weld SVN: r7186 - in archetypes/javaee6-webapp/tags: 1.0.1.Beta2 and 34 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-20 02:33:19 -0500 (Thu, 20 Jan 2011)
New Revision: 7186
Added:
archetypes/javaee6-webapp/tags/1.0.1.Beta2/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/maven/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/maven/archetype-metadata.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.factorypath
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.settings/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/pom.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.html
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.txt
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/controller/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/model/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/model/Member.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources-jbossas/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/META-INF/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/import.sql
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.jsf
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/css/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/archetype.properties
archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/goal.txt
Log:
1.0.1.Beta2 release
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/pom.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,80 @@
+<?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>
+
+ <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.Beta2</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>JBoss Java EE 6 Webapp</name>
+
+ <description>An archetype that generates a starter Java EE 6 webapp project</description>
+
+ <url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <roles>
+ <role>Weld archetypes co-lead</role>
+ </roles>
+ <email>stevenboscarine(a)gmail.com</email>
+ <organization>Community Volunteer</organization>
+ <organizationUrl>http://chip.org/</organizationUrl>
+ <url>http://www.beacon16.com/</url>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <roles>
+ <role>Weld archetypes co-lead</role>
+ </roles>
+ <email>dan.j.allen(a)gmail.com</email>
+ <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>pete.muir(a)jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ </developers>
+
+ <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>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/trunk</url>
+ </scm>
+</project>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/META-INF/maven/archetype-metadata.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="jboss-javaee6-webapp-src"
+ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descript..."
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <requiredProperties>
+ <requiredProperty key="name">
+ <defaultValue>Java EE 6 webapp project</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.MF</include>
+ <include>**/*.png</include>
+ <include>**/*.xhtml</include>
+ <include>**/*.xml</include>
+ <include>**/*.css</include>
+ <include>**/*.jsf</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.sql</include>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/resources-jbossas</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/resources-glassfish-embedded</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/resources-jbossas</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.prefs</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>**/*.factorypath</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>.settings</directory>
+ <includes>
+ <include>**/*.prefs</include>
+ <include>**/*.component</include>
+ <include>**/*.container</include>
+ <include>**/*.jsdtscope</include>
+ <include>**/*.name</include>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>readme.txt</include>
+ <include>readme.html</include>
+ <include>archetype-excludes.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>archetype-pom.xml</include>
+ <include>.classpath</include>
+ <include>.project</include>
+ <include>create-archetype.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.factorypath
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.factorypath (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.factorypath 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,5 @@
+<factorypath>
+ <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.1.1.Final/hibernate-jpamodelgen-1.1.1.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.apt.core.prefs 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
+org.eclipse.jdt.apt.reconcileEnabled=true
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/pom.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/pom.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,279 @@
+<?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>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+
+ <name>${name}</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>
+
+ <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.Alpha4</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>
+
+ <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>
+ <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.Beta1</version>
+ </dependency>
+
+ <!-- Uncomment if deploying to JBoss AS (but not a requirement) -->
+ <!--
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.0.0.Beta4</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.0.0.GA</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>
+
+ <!-- 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>
+
+ <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>
+
+ <profile>
+ <!-- An optional Arquillian testing profile that executes tests in GlassFish Embedded -->
+ <!-- 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>
+ </profiles>
+</project>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.html
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.html (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.html 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,217 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title></title>
+<meta name="generator" content="HTML::TextToHTML v2.51"/>
+</head>
+<body>
+<h1><a name="section_1">${artifactId}</a></h1>
+<p> <strong>Source archetype:</strong> jboss-javaee6-webapp
+</p><h2><a name="section_1_1">What is it?</a></h2>
+<p> This is your project! It's a sample, deployable Maven 2 project to help you
+ get your foot in the door developing with Java EE 6. This project is setup to
+ allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0,
+ EJB 3.1, JPA 2.0 and Bean Validation 1.0) that can run on a certified
+ application server (Full or Web Profile). It includes a persistence unit and
+ some sample persistence and transaction code to help you get your feet wet
+ with database access in enterprise Java.
+</p><h2><a name="section_1_2">System requirements</a></h2>
+<p> All you need to build this project is Java 5.0 (Java SDK 1.5) or better, Maven
+ 2.0.10 or better. We strongly recommend, however, that you use Java 6.0 (Java
+ SDK 1.6) and Maven 3.
+</p><p> The application this project produces is designed to be run on a Java EE 6
+ application server. We recommend JBoss AS 6.0.0.Final or GlassFish 3.1, though
+ it should work on any server that is Java EE 6 compliant.
+
+</p><dl>
+ <dt>NOTE</dt>
+<dd> This project retrieves artifacts from the JBoss Community Maven repository, a
+ superset of the Maven central repository, because there are certain Java EE
+ API JARs that are not published to Maven central (for details, see the JIRA
+ <a href="https://jira.jboss.org/jira/browse/WELD-222">https://jira.jboss.org/jira/browse/WELD-222</a>). The integration testing
+ framework used by the project, Arquillian, is also only available in the JBoss
+ Community Maven repository. </dd><dt>NOTE</dt>
+<dd> Prior to JBoss AS 6.0.0.CR1, modifications were required to get JAX-RS working
+ properly on JBoss AS. We strongly recommend upgrading to 6.0.0.Final.</dd></dl>
+<p> With the prerequisites out of the way, you're ready to build and deploy.
+</p><h2><a name="section_1_3">Deploying the application</a></h2>
+<p> To deploy the application, you first need to produce the archive to deploy using
+ the following Maven goal:
+</p><pre>
+ mvn package</pre>
+<p> If you want to deploy the application on JBoss AS (standalone), make sure that
+ your JBOSS_HOME environment variable points to a JBoss AS 6 installation.
+</p><p> Alternatively, you can set the location of JBoss AS using the following
+ profile definition in the .m2/settings.xml file in your home directory:
+</p><pre>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <settings
+ xmlns="<a href="http://maven.apache.org/POM/4.0.0">http://maven.apache.org/POM/4.0.0</a>"
+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance">http://www.w3.org/2001/XMLSchema-instance</a>"
+ xsi:schemaLocation="<a href="http://maven.apache.org/POM/4.0.0">http://maven.apache.org/POM/4.0.0</a> <a href="http://maven.apache.org/xsd/settings-1.0.0.xsd">http://maven.apache.org/xsd/settings-1.0.0.xsd</a>">
+
+ <profiles>
+ <profile>
+ <id>environment</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <jboss.home>/path/to/jboss-as-6.0.0.Final</jboss.home>
+ </properties>
+ </profile>
+ </profiles>
+
+ </settings></pre>
+<p> Once you've set either the JBOSS_HOME environment variable or the jboss.home
+ Maven property, you can deploy to JBoss AS by executing the following command:
+</p><pre>
+ mvn package jboss:hard-deploy</pre>
+<p> This will deploy two artifacts, target/${artifactId}.war and
+ default-ds.xml.
+
+</p><dl>
+ <dt>IMPORTANT</dt>
+<dd> Don't forget to deploy default-ds.xml! </dd><dt>NOTE</dt>
+<dd> The default-ds.xml file installs a data source named jdbc/__default, so that
+ both JBoss AS and GlassFish have a data source with the same name.</dd></dl>
+<p> You can also set jboss.home on the commandline:
+</p><pre>
+ mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.Final</pre>
+<p> In all, you have three options to set the path of your JBoss AS installation:
+</p><ol>
+ <li>Set the JBOSS_HOME environment variable (e.g., export JBOSS_HOME=/path/to/jboss-as)
+ </li><li>Define the jboss.home Maven property in ${symbol_dollar}HOME/.m2/settings.xml
+ </li><li>Override the jboss.home Maven property from the commandline using -Djboss.home=/path/to/jboss-as</li></ol>
+<p> Now start JBoss AS. The application will be running at the following URL:
+</p><ul>
+ <li><a href="http://localhost:8080/${artifactId}/">http://localhost:8080/${artifactId}/</a></li></ul>
+<p> To undeploy from JBoss AS, run this command:
+</p><pre>
+ mvn jboss:hard-undeploy</pre>
+<p> There are several ways to deploy the archive to GlassFish. The recommended
+ approach is to open the project in NetBeans 6.8, right-click on the project
+ and select "Run" from the context menu. That starts JavaDB, GlassFish and
+ deploys the application. NetBeans then provides incremental deployment of web
+ resources.
+</p><p> You can also start GlassFish from the commandline. Change to the glassfish/bin
+ directory in the GlassFish install root and run these three commands (leading
+ ./ not required on Windows):
+</p><pre>
+ ./asadmin start-database
+ ./asadmin start-domain domain1</pre>
+<dl>
+ <dt>IMPORTANT</dt>
+<dd> Don't forget to start the JavaDB database! </dd><dt>NOTE</dt>
+<dd> NetBeans starts the database automatically when it starts up GlassFish. If you
+ have the GlassFish Tools Eclipse plug-in, you have to enable this feature.
+ Select Window > Preferences > GlassFish Server Preferences and check the
+ option "Start JavaDB database process when > Starting GlassFish Server"</dd></dl>
+<p> Now you can either deploy the target/${artifactId}.war through the
+ web-based GlassFish admininstration console, or you can again use asadmin:
+</p><pre>
+ ./asadmin deploy target/${artifactId}.war</pre>
+<p> To undeploy the application, run:
+</p><pre>
+ ./asadmin undeploy ${artifactId}</pre>
+<h2><a name="section_1_4">Running the Arquillian tests</a></h2>
+<p> By default, tests are configured to be skipped. The reason is that the sample
+ test is an Arquillian test, which requires the use of a container. You can
+ activate this test by selecting one of the two container configurations
+ provided, JBoss AS 6 (remote) or GlassFish 3 (embedded).
+</p><p> To run the test in Embedded GlassFish, first make sure that you don't have a
+ GlassFish container running (to avoid port conflicts). Then run the test goal
+ with the following profile activated:
+</p><pre>
+ mvn clean test -Parq-glassfish-embedded</pre>
+<p> (The clean goal is only required when you switch between containers)
+</p><p> To run the test in JBoss AS 6, first start a JBoss AS 6 instance. Then, run the
+ test goal with the following profile activated:
+</p><pre>
+ mvn clean test -Parq-jbossas-remote</pre>
+<p> Consult the Arquillian reference documentation to register profiles for any
+ supported container.
+</p><ul>
+ <li><a href="http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h...">http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h...</a></li></ul>
+<h2><a name="section_1_5">Importing the project into an IDE</a></h2>
+<p> If you created the project using the Maven 2 archetype wizard in your IDE
+ (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should
+ already have an IDE project.
+</p><p> If you created the project from the commandline using archetype:generate, then
+ you need to import the project into your IDE. If you are using NetBeans 6.8 or
+ IntelliJ IDEA 9, then all you have to do is open the project as an existing
+ project. Both of these IDEs recognize Maven 2 projects natively.
+</p><p> To import the project into Eclipse, you need the m2eclipse plugins installed.
+ Installation instructions are provided on the m2eclipse project site:
+</p><ul>
+ <li><a href="http://m2eclipse.sonatype.org/installing-m2eclipse.html">http://m2eclipse.sonatype.org/installing-m2eclipse.html</a></li></ul>
+<p> Here's the quick guide:
+</p><ul>
+ <li>Select Help > Install New Software...
+ </li><li>Click the Add... button
+ </li><li>Add the repository URL <a href="http://m2eclipse.sonatype.org/update">http://m2eclipse.sonatype.org/update</a>
+ </li><li>Select and install the Maven Integration for Eclipse
+ </li><li>Restart as suggested
+ </li><li>Repeat the first two steps
+ </li><li>Add the repository URL <a href="http://m2eclipse.sonatype.org/sites/m2e-extras">http://m2eclipse.sonatype.org/sites/m2e-extras</a>
+ </li><li>Select and install the Maven Integration for WTP (Optional)
+ </li><li>Restart as suggested</li></ul>
+<p> Once the m2eclipse plugins are installed, you'll be ready to import the
+ project into Eclipse and run the project on a Java EE server. We also
+ recommend that you install the JBoss Tools plugins if you plan to deploy
+ to JBoss AS - <a href="http://jboss.org/tools">http://jboss.org/tools</a>
+</p><dl>
+ <dt>NOTE</dt>
+<dd> If you are using Eclipse as your IDE, we we strongly recommend that you use
+ Eclipse 3.6 (Helios) - <a href="http://www.eclipse.org/helios">http://www.eclipse.org/helios</a></dd></dl>
+<p> Select File > Import. . . and choose the Maven > Existing Maven Projects option.
+ Navigate to the root directory of your project. Eclipse should recognize the
+ Maven project and preselect it in the Project box. Click Finish and m2eclipse
+ will take it from there.
+</p><dl>
+ <dt>NOTE</dt>
+<dd> You cannot use the import option General > Existing Projects into Workspace
+ because Eclipse does not recognize Maven projects as Eclipse projects
+ natively. You must use the importer provided by m2eclipse as just described.</dd></dl>
+<p> Additional configuration is required to get Eclipse to generate the JPA
+ metamodel. The archetype includes the necessary Eclipse config files in your
+ project. To enable this feature, right click on the project and select:
+</p><pre>
+ Properties > Java Compiler > Annotation Processing</pre>
+<p> Check "Enable annotation processing" then click OK and OK again when your are
+ prompted to run a project build.
+</p><p> This configuration is described in further detail in the Hibernate JPA documentation:
+</p><ul>
+ <li><a href="http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s...">http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s...</a></li></ul>
+<p> Once the project is imported into the IDE, you can execute the Maven commands
+ through the IDE controls to deploy the application to a container.
+</p><p> To deploy to GlassFish from Eclipse, you'll need the GlassFish Tools Bundle,
+ available at the update site <a href="http://download.java.net/glassfish/eclipse/helios">http://download.java.net/glassfish/eclipse/helios</a>
+ or from the Help > Eclipse Marketplace. . .
+</p><h2><a name="section_1_6">Downloading the sources and Javadocs</a></h2>
+<p> If you want to be able to debug into the source code or look at the Javadocs
+ of any library in the project, you can run either of the following two
+ commands to pull them into your local repository. The IDE should then detect
+ them.
+</p><pre>
+ mvn dependency:sources
+ mvn dependency:resolve -Dclassifier=javadoc</pre>
+<h2><a name="section_1_7">Resources</a></h2>
+<ul>
+ <li>Weld archetypes
+ <ul>
+ <li>Quickstart: <a href="http://seamframework.org/Documentation/WeldQuickstartForMavenUsers">http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</a>
+ </li><li>Issue tracker: <a href="https://jira.jboss.org/jira/browse/WELDRAD">https://jira.jboss.org/jira/browse/WELDRAD</a>
+ </li><li>Source code: <a href="http://anonsvn.jboss.org/repos/weld/archetypes">http://anonsvn.jboss.org/repos/weld/archetypes</a>
+ </li><li>Forums: <a href="http://seamframework.org/Community/WeldUsers">http://seamframework.org/Community/WeldUsers</a>
+ </li></ul>
+ </li><li>JSR-299 overview: <a href="http://seamframework.org/Weld">http://seamframework.org/Weld</a>
+ </li><li>JSF community site: <a href="http://www.javaserverfaces.org">http://www.javaserverfaces.org</a>
+</li></ul>
+
+</body>
+</html>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.txt
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.txt (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/readme.txt 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,258 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+ ${artifactId}
+ ++++++++++++++++++++++++
+
+ ${symbol_pound}Source archetype:${symbol_pound} jboss-javaee6-webapp
+
+ What is it?
+ ===========
+
+ This is your project! It's a sample, deployable Maven 2 project to help you
+ get your foot in the door developing with Java EE 6. This project is setup to
+ allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0,
+ EJB 3.1, JPA 2.0 and Bean Validation 1.0) that can run on a certified
+ application server (Full or Web Profile). It includes a persistence unit and
+ some sample persistence and transaction code to help you get your feet wet
+ with database access in enterprise Java.
+
+ System requirements
+ ===================
+
+ All you need to build this project is Java 5.0 (Java SDK 1.5) or better, Maven
+ 2.0.10 or better. We strongly recommend, however, that you use Java 6.0 (Java
+ SDK 1.6) and Maven 3.
+
+ The application this project produces is designed to be run on a Java EE 6
+ application server. We recommend JBoss AS 6.0.0.Final or GlassFish 3.1, though
+ it should work on any server that is Java EE 6 compliant.
+
+ NOTE:
+ This project retrieves artifacts from the JBoss Community Maven repository, a
+ superset of the Maven central repository, because there are certain Java EE
+ API JARs that are not published to Maven central (for details, see the JIRA
+ https://jira.jboss.org/jira/browse/WELD-222). The integration testing
+ framework used by the project, Arquillian, is also only available in the JBoss
+ Community Maven repository.
+
+ NOTE:
+ Prior to JBoss AS 6.0.0.CR1, modifications were required to get JAX-RS working
+ properly on JBoss AS. We strongly recommend upgrading to 6.0.0.Final.
+
+ With the prerequisites out of the way, you're ready to build and deploy.
+
+ Deploying the application
+ =========================
+
+ To deploy the application, you first need to produce the archive to deploy using
+ the following Maven goal:
+
+ mvn package
+
+ If you want to deploy the application on JBoss AS (standalone), make sure that
+ your JBOSS_HOME environment variable points to a JBoss AS 6 installation.
+
+ Alternatively, you can set the location of JBoss AS using the following
+ profile definition in the .m2/settings.xml file in your home directory:
+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <settings
+ 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/settings-1.0.0.xsd">
+
+ <profiles>
+ <profile>
+ <id>environment</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <jboss.home>/path/to/jboss-as-6.0.0.Final</jboss.home>
+ </properties>
+ </profile>
+ </profiles>
+
+ </settings>
+
+ Once you've set either the JBOSS_HOME environment variable or the jboss.home
+ Maven property, you can deploy to JBoss AS by executing the following command:
+
+ mvn package jboss:hard-deploy
+
+ This will deploy two artifacts, target/${artifactId}.war and
+ default-ds.xml.
+
+ IMPORTANT:
+ Don't forget to deploy default-ds.xml!
+
+ NOTE:
+ The default-ds.xml file installs a data source named jdbc/__default, so that
+ both JBoss AS and GlassFish have a data source with the same name.
+
+ You can also set jboss.home on the commandline:
+
+ mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.Final
+
+ In all, you have three options to set the path of your JBoss AS installation:
+
+ 1. Set the JBOSS_HOME environment variable (e.g., export JBOSS_HOME=/path/to/jboss-as)
+ 2. Define the jboss.home Maven property in ${symbol_dollar}HOME/.m2/settings.xml
+ 3. Override the jboss.home Maven property from the commandline using -Djboss.home=/path/to/jboss-as
+
+ Now start JBoss AS. The application will be running at the following URL:
+
+ - http://localhost:8080/${artifactId}/
+
+ To undeploy from JBoss AS, run this command:
+
+ mvn jboss:hard-undeploy
+
+ There are several ways to deploy the archive to GlassFish. The recommended
+ approach is to open the project in NetBeans 6.8, right-click on the project
+ and select "Run" from the context menu. That starts JavaDB, GlassFish and
+ deploys the application. NetBeans then provides incremental deployment of web
+ resources.
+
+ You can also start GlassFish from the commandline. Change to the glassfish/bin
+ directory in the GlassFish install root and run these three commands (leading
+ ./ not required on Windows):
+
+ ./asadmin start-database
+ ./asadmin start-domain domain1
+
+ IMPORTANT:
+ Don't forget to start the JavaDB database!
+
+ NOTE:
+ NetBeans starts the database automatically when it starts up GlassFish. If you
+ have the GlassFish Tools Eclipse plug-in, you have to enable this feature.
+ Select Window > Preferences > GlassFish Server Preferences and check the
+ option "Start JavaDB database process when > Starting GlassFish Server"
+
+ Now you can either deploy the target/${artifactId}.war through the
+ web-based GlassFish admininstration console, or you can again use asadmin:
+
+ ./asadmin deploy target/${artifactId}.war
+
+ To undeploy the application, run:
+
+ ./asadmin undeploy ${artifactId}
+
+ Running the Arquillian tests
+ ============================
+
+ By default, tests are configured to be skipped. The reason is that the sample
+ test is an Arquillian test, which requires the use of a container. You can
+ activate this test by selecting one of the two container configurations
+ provided, JBoss AS 6 (remote) or GlassFish 3 (embedded).
+
+ To run the test in Embedded GlassFish, first make sure that you don't have a
+ GlassFish container running (to avoid port conflicts). Then run the test goal
+ with the following profile activated:
+
+ mvn clean test -Parq-glassfish-embedded
+
+ (The clean goal is only required when you switch between containers)
+
+ To run the test in JBoss AS 6, first start a JBoss AS 6 instance. Then, run the
+ test goal with the following profile activated:
+
+ mvn clean test -Parq-jbossas-remote
+
+ Consult the Arquillian reference documentation to register profiles for any
+ supported container.
+
+ - http://docs.jboss.org/arquillian/reference/latest/en-US/html/containers.h...
+
+ Importing the project into an IDE
+ =================================
+
+ If you created the project using the Maven 2 archetype wizard in your IDE
+ (Eclipse, NetBeans or IntelliJ IDEA), then there is nothing to do. You should
+ already have an IDE project.
+
+ If you created the project from the commandline using archetype:generate, then
+ you need to import the project into your IDE. If you are using NetBeans 6.8 or
+ IntelliJ IDEA 9, then all you have to do is open the project as an existing
+ project. Both of these IDEs recognize Maven 2 projects natively.
+
+ To import the project into Eclipse, you need the m2eclipse plugins installed.
+ Installation instructions are provided on the m2eclipse project site:
+
+ - http://m2eclipse.sonatype.org/installing-m2eclipse.html
+
+ Here's the quick guide:
+
+ - Select Help > Install New Software...
+ - Click the Add... button
+ - Add the repository URL http://m2eclipse.sonatype.org/update
+ - Select and install the Maven Integration for Eclipse
+ - Restart as suggested
+ - Repeat the first two steps
+ - Add the repository URL http://m2eclipse.sonatype.org/sites/m2e-extras
+ - Select and install the Maven Integration for WTP (Optional)
+ - Restart as suggested
+
+ Once the m2eclipse plugins are installed, you'll be ready to import the
+ project into Eclipse and run the project on a Java EE server. We also
+ recommend that you install the JBoss Tools plugins if you plan to deploy
+ to JBoss AS - http://jboss.org/tools
+
+ NOTE:
+ If you are using Eclipse as your IDE, we we strongly recommend that you use
+ Eclipse 3.6 (Helios) - http://www.eclipse.org/helios
+
+ Select File > Import. . . and choose the Maven > Existing Maven Projects option.
+ Navigate to the root directory of your project. Eclipse should recognize the
+ Maven project and preselect it in the Project box. Click Finish and m2eclipse
+ will take it from there.
+
+ NOTE:
+ You cannot use the import option General > Existing Projects into Workspace
+ because Eclipse does not recognize Maven projects as Eclipse projects
+ natively. You must use the importer provided by m2eclipse as just described.
+
+ Additional configuration is required to get Eclipse to generate the JPA
+ metamodel. The archetype includes the necessary Eclipse config files in your
+ project. To enable this feature, right click on the project and select:
+
+ Properties > Java Compiler > Annotation Processing
+
+ Check "Enable annotation processing" then click OK and OK again when your are
+ prompted to run a project build.
+
+ This configuration is described in further detail in the Hibernate JPA documentation:
+
+ - http://docs.jboss.org/hibernate/stable/jpamodelgen/reference/en-US/html_s...
+
+ Once the project is imported into the IDE, you can execute the Maven commands
+ through the IDE controls to deploy the application to a container.
+
+ To deploy to GlassFish from Eclipse, you'll need the GlassFish Tools Bundle,
+ available at the update site http://download.java.net/glassfish/eclipse/helios
+ or from the Help > Eclipse Marketplace. . .
+
+ Downloading the sources and Javadocs
+ ====================================
+
+ If you want to be able to debug into the source code or look at the Javadocs
+ of any library in the project, you can run either of the following two
+ commands to pull them into your local repository. The IDE should then detect
+ them.
+
+ mvn dependency:sources
+ mvn dependency:resolve -Dclassifier=javadoc
+
+ Resources
+ =========
+
+ - Weld archetypes
+ - Quickstart: http://seamframework.org/Documentation/WeldQuickstartForMavenUsers
+ - Issue tracker: https://jira.jboss.org/jira/browse/WELDRAD
+ - Source code: http://anonsvn.jboss.org/repos/weld/archetypes
+ - Forums: http://seamframework.org/Community/WeldUsers
+ - JSR-299 overview: http://seamframework.org/Weld
+ - JSF community site: http://www.javaserverfaces.org
+
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,66 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.controller;
+
+import org.jboss.seam.solder.log.Category;
+import ${package}.data.MemberRepository;
+import ${package}.model.Member;
+import javax.annotation.PostConstruct;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Model;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.transaction.UserTransaction;
+
+import org.jboss.logging.Logger;
+
+// 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
+@Model
+public class MemberRegistration
+{
+ @Inject @Category("${artifactId}")
+ private Logger log;
+
+ @Inject
+ @MemberRepository
+ private EntityManager em;
+
+ @Inject
+ private UserTransaction utx;
+
+ @Inject
+ private Event<Member> memberEventSrc;
+
+ private Member 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();
+ }
+
+ @PostConstruct
+ public void initNewMember()
+ {
+ newMember = new Member();
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,54 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.data;
+
+import ${package}.model.Member;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.event.Reception;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+@RequestScoped
+public class MemberListProducer
+{
+ @Inject
+ @MemberRepository
+ private EntityManager em;
+
+ 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;
+ }
+
+ 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();
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepository.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,24 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.data;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * 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 })
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface MemberRepository
+{
+ /* class body intentionally left blank */
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/MemberRepositoryProducer.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,28 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.data;
+
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * This class uses CDI to produce EntityManager instances qualified that are
+ * qualified as &${symbol_pound}064;MemberRepository.
+ *
+ * <p>Example injection on a managed bean field:</p>
+ * <pre>
+ * &${symbol_pound}064;Inject &${symbol_pound}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;
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/data/SeedDataImporter.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,72 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.data;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.TransactionRequiredException;
+import javax.transaction.UserTransaction;
+
+import org.jboss.logging.Logger;
+import org.jboss.seam.solder.log.Category;
+
+import ${package}.model.Member;
+
+/**
+ * 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>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("${artifactId}")
+ private Logger log;
+
+ @Inject
+ @MemberRepository
+ private EntityManager em;
+
+ @Inject
+ private UserTransaction tx;
+
+ @PostConstruct
+ public void importData()
+ {
+ Member member1 = new Member();
+ member1.setName("John Smith");
+ member1.setEmail("john.smith(a)mailinator.com");
+ 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);
+ }
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/model/Member.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/model/Member.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/model/Member.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,86 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Entity
+@XmlRootElement
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = "email"))
+public class Member implements Serializable
+{
+ private Long id;
+ private String name;
+ private String email;
+ private String phoneNumber;
+
+ @Id
+ @GeneratedValue
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(Long id)
+ {
+ this.id = 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 setName(String name)
+ {
+ this.name = name;
+ }
+
+ @NotNull
+ @NotEmpty
+ @Email
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+ @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;
+ }
+
+ /** Default value included to remove warning. Remove or modify at will. */
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,20 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.rest;
+
+import javax.ws.rs.ApplicationPath;
+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>
+ */
+@ApplicationPath("/rest")
+public class JaxRsActivator extends Application
+{
+ /* class body intentionally left blank */
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,46 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.rest;
+
+import ${package}.model.Member;
+import ${package}.data.MemberRepository;
+import java.util.List;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ * JAX-RS Example
+ *
+ * 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;
+
+ @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);
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,29 @@
+<?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>
+ -->
+
+ <!-- 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"/>
+
+ <!-- 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>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/import.sql
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/import.sql (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources/import.sql 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,2 @@
+-- If you are using Hibernate as the JPA provider, you can use this file to load seed data into the database using SQL statements
+-- The portable approach is to use a startup component (such as the @PostConstruct method of a @Startup @Singleton)
\ No newline at end of file
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/resources-jbossas/default-ds.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,15 @@
+<?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>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>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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=""/>
+</Context>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file can be an empty text file -->
+<!-- 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">
+ <alternatives/>
+ <decorators/>
+ <interceptors/>
+</beans>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +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">
+
+ <!-- This descriptor activates the JSF 2.0 Servlet -->
+
+ <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. -->
+
+</faces-config>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "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>
+ </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">Weld 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">contributing</a> it back to the
+ community!
+ </p>
+ </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&nam...">Tune
+ logging levels (JBoss AS)</a>
+ </p>
+ </div>
+ </div>
+ </h:body>
+</html>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,35 @@
+<?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">
+
+ <!-- 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 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>
+ -->
+</web-app>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.jsf
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.jsf (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.jsf 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,8 @@
+The contents of this file will not be displayed!
+
+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
+
+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
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +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>
+
+ <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>
+</ui:composition>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,40 @@
+body {
+ 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;
+}
+#sidebar {
+ font-size: 0.9em;
+ width: 225px;
+ float: right;
+ border: 1px solid #666666;
+ background: #EAECEE;
+ padding: 0 15px 5px 15px;
+}
+#sidebar ul {
+ padding-left: 30px;
+}
+#footer {
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
+ padding: 3em 0 0 0;
+}
+code {
+ font-size: 1.1em;
+}
+span.invalid {
+ padding-left: 3px;
+ color: red;
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
===================================================================
(Binary files differ)
Property changes on: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
===================================================================
(Binary files differ)
Property changes on: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MavenArtifactResolver.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,94 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.test;
+
+import java.io.File;
+
+/**
+ * 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>
+ *
+ * <pre>
+ * WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ * .addLibrary(MavenArtifactResolver.resolve("commons-lang:commons-lang:2.5"));
+ * </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>
+ *
+ * <pre>
+ * <systemProperties>
+ * <property>
+ * <name>maven.repo.local</name>
+ * <value>${symbol_dollar}{maven.repo.local}</value>
+ * </property>
+ * </systemProperties>
+ * </pre>
+ *
+ * <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 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 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]);
+ }
+
+ return artifacts;
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,59 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.test;
+
+import static org.junit.Assert.*;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import ${package}.controller.MemberRegistration;
+import ${package}.data.MemberRepository;
+import ${package}.data.MemberRepositoryProducer;
+import ${package}.model.Member;
+
+(a)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)
+ .addManifestResource("test-persistence.xml", "persistence.xml")
+ .addWebResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Inject MemberRegistration memberRegistration;
+
+ @Inject Logger log;
+
+ @Test
+ public void testRegister() throws Exception
+ {
+ Member newMember = memberRegistration.getNewMember();
+ newMember.setName("Jane Doe");
+ newMember.setEmail("jane(a)mailinator.com");
+ 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());
+ }
+}
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources/arquillian.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources/arquillian.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +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">
+
+ <!-- Uncomment to have test archives exported to the file system for inspection -->
+ <!--
+ <engine>
+ <deploymentExportPath>target/</deploymentExportPath>
+ </engine>
+ -->
+
+ <!-- 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>
+
+ <!-- Example configuration for a remote JBoss AS instance -->
+ <jbossas-remote:container>
+ <jbossas-remote:remoteServerHttpPort>8080</jbossas-remote:remoteServerHttpPort>
+ </jbossas-remote:container>
+
+</arquillian>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/sun-resources.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +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">
+<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>
+</resources>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-glassfish-embedded/test-persistence.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +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>
+</persistence>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/jndi.properties 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/main/resources/archetype-resources/src/test/resources-jbossas/test-persistence.xml 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,17 @@
+<?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>
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/archetype.properties
===================================================================
--- archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/archetype.properties (rev 0)
+++ archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/archetype.properties 2011-01-20 07:33:19 UTC (rev 7186)
@@ -0,0 +1,5 @@
+#Thu Jan 20 02:31:50 EST 2011
+version=0.1-SNAPSHOT
+name=Java EE 6 webapp project
+groupId=archetype.it
+artifactId=basic
Added: archetypes/javaee6-webapp/tags/1.0.1.Beta2/src/test/resources/projects/basic/goal.txt
===================================================================
13 years, 11 months
- 1
- 0
Weld SVN: r7185 - in archetypes/javaee6-webapp/trunk: src/main/java/com/mycompany/data and 1 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-20 02:19:45 -0500 (Thu, 20 Jan 2011)
New Revision: 7185
Added:
archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml
Removed:
archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml
Modified:
archetypes/javaee6-webapp/trunk/create-archetype.sh
archetypes/javaee6-webapp/trunk/pom.xml
archetypes/javaee6-webapp/trunk/readme.txt
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java
Log:
switch back to default-ds.xml; add javadoc
Modified: archetypes/javaee6-webapp/trunk/create-archetype.sh
===================================================================
--- archetypes/javaee6-webapp/trunk/create-archetype.sh 2011-01-19 22:31:59 UTC (rev 7184)
+++ archetypes/javaee6-webapp/trunk/create-archetype.sh 2011-01-20 07:19:45 UTC (rev 7185)
@@ -31,9 +31,9 @@
;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
sed -i 's;<name>jboss-javaee6-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
sed -i 's;eclipse-dot-files/\?;;' $ARCHETYPE_DIR/src/main/resources/META-INF/maven/archetype-metadata.xml
-#sed -i 's;\(<jndi-name>\)[^<]\+\(</jndi-name>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/application-ds.xml
+#sed -i 's;\(<jndi-name>\)[^<]\+\(</jndi-name>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/default-ds.xml
#sed -i 's;\(<jta-data-source>\)[^<]\+\(</jta-data-source>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources/META-INF/persistence.xml
-mv $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/application-ds.xml $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/__artifactId__-ds.xml
+#mv $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/default-ds.xml $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/__artifactId__-ds.xml
rsync -az eclipse-dot-files/ $ARCHETYPE_RESOURCES_DIR/
# fix the archetype plugin being an idiot
find $ARCHETYPE_RESOURCES_DIR -type f -exec sed -i 's;packageInPathFormat;package;g' {} \;
@@ -52,5 +52,5 @@
cd target
mvn archetype:generate -B -DarchetypeCatalog=local \
-DarchetypeArtifactId=jboss-javaee6-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \
- -DartifactId=test-project -DgroupId=com.acme -Dpackage=com.acme.test -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project"
+ -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-01-19 22:31:59 UTC (rev 7184)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2011-01-20 07:19:45 UTC (rev 7185)
@@ -173,7 +173,7 @@
<serverName>${jboss.domain}</serverName>
<fileNames>
<!-- JNDI DataSource that connects to in-memory HSQLDB to demonstrate JPA -->
- <fileName>src/main/resources-jbossas/${project.artifactId}-ds.xml</fileName>
+ <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>
Modified: archetypes/javaee6-webapp/trunk/readme.txt
===================================================================
--- archetypes/javaee6-webapp/trunk/readme.txt 2011-01-19 22:31:59 UTC (rev 7184)
+++ archetypes/javaee6-webapp/trunk/readme.txt 2011-01-20 07:19:45 UTC (rev 7185)
@@ -22,7 +22,7 @@
SDK 1.6) and Maven 3.
The application this project produces is designed to be run on a Java EE 6
- application server. We recommend JBoss AS 6.0.0.CR1 or GlassFish 3.0.1, though
+ application server. We recommend JBoss AS 6.0.0.Final or GlassFish 3.1, though
it should work on any server that is Java EE 6 compliant.
NOTE:
@@ -35,7 +35,7 @@
NOTE:
Prior to JBoss AS 6.0.0.CR1, modifications were required to get JAX-RS working
- properly on JBoss AS. We strongly recommend upgrading to 6.0.0.CR1.
+ properly on JBoss AS. We strongly recommend upgrading to 6.0.0.Final.
With the prerequisites out of the way, you're ready to build and deploy.
@@ -66,7 +66,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <jboss.home>/path/to/jboss-as-6.0.0.M4</jboss.home>
+ <jboss.home>/path/to/jboss-as-6.0.0.Final</jboss.home>
</properties>
</profile>
</profiles>
@@ -90,7 +90,7 @@
You can also set jboss.home on the commandline:
- mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.M4
+ mvn package jboss:hard-deploy -Djboss.home=/path/to/jboss-as-6.0.0.Final
In all, you have three options to set the path of your JBoss AS installation:
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-01-19 22:31:59 UTC (rev 7184)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2011-01-20 07:19:45 UTC (rev 7185)
@@ -1,7 +1,5 @@
package com.mycompany.data;
-import org.jboss.seam.solder.log.Category;
-import com.mycompany.model.Member;
import javax.annotation.PostConstruct;
import javax.ejb.Singleton;
import javax.ejb.Startup;
@@ -11,12 +9,18 @@
import javax.transaction.UserTransaction;
import org.jboss.logging.Logger;
+import org.jboss.seam.solder.log.Category;
+import com.mycompany.model.Member;
+
/**
- * Import seed data into the database on application startup using
- * a startup singleton EJB.
+ * Import seed data into the database on application startup.
*
- * FIXME Better would be to make this a ServletContextListener (first verify it works on all containers)
+ * <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>
*
* @author Dan Allen
*/
Deleted: archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml 2011-01-19 22:31:59 UTC (rev 7184)
+++ archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml 2011-01-20 07:19:45 UTC (rev 7185)
@@ -1,15 +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>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>
Copied: archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml (from rev 7184, archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml)
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml (rev 0)
+++ archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml 2011-01-20 07:19:45 UTC (rev 7185)
@@ -0,0 +1,15 @@
+<?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>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>
13 years, 11 months
- 1
- 0
Weld SVN: r7184 - in archetypes/javaee6-webapp/trunk: eclipse-dot-files and 5 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2011-01-19 17:31:59 -0500 (Wed, 19 Jan 2011)
New Revision: 7184
Added:
archetypes/javaee6-webapp/trunk/archetype-excludes.txt
archetypes/javaee6-webapp/trunk/create-archetype.sh
archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml
Removed:
archetypes/javaee6-webapp/trunk/build.sh
archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml
Modified:
archetypes/javaee6-webapp/trunk/archetype-pom.xml
archetypes/javaee6-webapp/trunk/archetype.properties
archetypes/javaee6-webapp/trunk/eclipse-dot-files/.factorypath
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/SeedDataImporter.java
archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml
archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java
archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java
Log:
migrate to Seam Solder; build improvements
- rename build script to create-archetype.sh
- use an excludes file when copying archetype sources
- upgrade to JBoss AS 6.0.0.Final and related artifacts
- upgrade Hibernate JPA model gen; remove unnecessary Maven plugin config
Added: archetypes/javaee6-webapp/trunk/archetype-excludes.txt
===================================================================
--- archetypes/javaee6-webapp/trunk/archetype-excludes.txt (rev 0)
+++ archetypes/javaee6-webapp/trunk/archetype-excludes.txt 2011-01-19 22:31:59 UTC (rev 7184)
@@ -0,0 +1,11 @@
+*.swp
+.classpath
+.git
+.gitignore
+.project
+.settings
+.svn
+archetype-pom.xml
+archetype-excludes.txt
+WORKLOG
+eclipse-dot-files
Modified: archetypes/javaee6-webapp/trunk/archetype-pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/archetype-pom.xml 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/archetype-pom.xml 2011-01-19 22:31:59 UTC (rev 7184)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>12</version>
+ <version>17</version>
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
Modified: archetypes/javaee6-webapp/trunk/archetype.properties
===================================================================
--- archetypes/javaee6-webapp/trunk/archetype.properties 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/archetype.properties 2011-01-19 22:31:59 UTC (rev 7184)
@@ -4,6 +4,6 @@
# Java package of the source files; will be replaced with the ${package} expression
archetype.package=com.mycompany
archetype.languages=java
-# value of <artifactId> is converted to ${artifactId} expression in filtered files
+# value of <artifactId> element in POM is converted to ${artifactId} expression in filtered files
archetype.filteredExtensions=java,txt,html
name=Java EE 6 webapp project
Deleted: archetypes/javaee6-webapp/trunk/build.sh
===================================================================
--- archetypes/javaee6-webapp/trunk/build.sh 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/build.sh 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# This script generates an archetype into target/archetype from the source project.
-#
-# Two optional commands can be provided (in the order listed):
-#
-# install - which will automatically install the generated archetype in the local repository
-# generate - generate a project from the archetype into target/generated-project
-#
-
-ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
-ARCHETYPE_DIR=target/archetype
-ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
-
-echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
-txt2html -pb 1 -p 2 readme.txt > readme.html
-mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
-echo Relocating generated archetype project to $ARCHETYPE_DIR...
-rsync -az --exclude `basename $0` --exclude archetype-pom.xml --exclude eclipse-dot-files $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-rsync -az --exclude .svn eclipse-dot-files/ $ARCHETYPE_RESOURCES_DIR/
-cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
-mvn -f $ARCHETYPE_DIR/pom.xml clean
-echo Patching generated archetype...
-# could also use col -b
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
-sed -i 's;<name>jboss-javaee6-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i 's;eclipse-dot-files/\?;;' $ARCHETYPE_DIR/src/main/resources/META-INF/maven/archetype-metadata.xml
-# remove local file that NetBeans add to source project
-rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
-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
-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=generated-project -DgroupId=com.acme -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project"
-fi
Copied: archetypes/javaee6-webapp/trunk/create-archetype.sh (from rev 7090, archetypes/javaee6-webapp/trunk/build.sh)
===================================================================
--- archetypes/javaee6-webapp/trunk/create-archetype.sh (rev 0)
+++ archetypes/javaee6-webapp/trunk/create-archetype.sh 2011-01-19 22:31:59 UTC (rev 7184)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# This script generates an archetype into target/archetype from the source project.
+#
+# Two optional commands can be provided (in the order listed):
+#
+# install - which will automatically install the generated archetype in the local repository
+# generate - generate a project from the archetype into target/generated-project
+#
+
+ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
+ARCHETYPE_DIR=target/archetype
+ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
+
+echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
+if [ ! -z `which txt2html` ]; then
+ txt2html -pb 1 -p 2 readme.txt > readme.html
+else
+ 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...
+rsync -az --exclude `basename $0` --exclude-from=archetype-excludes.txt $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
+cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
+mvn -f $ARCHETYPE_DIR/pom.xml clean
+echo Patching generated archetype...
+# could also use col -b
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
+sed -i 's;<name>jboss-javaee6-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+sed -i 's;eclipse-dot-files/\?;;' $ARCHETYPE_DIR/src/main/resources/META-INF/maven/archetype-metadata.xml
+#sed -i 's;\(<jndi-name>\)[^<]\+\(</jndi-name>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/application-ds.xml
+#sed -i 's;\(<jta-data-source>\)[^<]\+\(</jta-data-source>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources/META-INF/persistence.xml
+mv $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/application-ds.xml $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/__artifactId__-ds.xml
+rsync -az eclipse-dot-files/ $ARCHETYPE_RESOURCES_DIR/
+# fix the archetype plugin being an idiot
+find $ARCHETYPE_RESOURCES_DIR -type f -exec sed -i 's;packageInPathFormat;package;g' {} \;
+# remove local file that NetBeans add to source project
+rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
+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
+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=test-project -DgroupId=com.acme -Dpackage=com.acme.test -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project"
+fi
Modified: archetypes/javaee6-webapp/trunk/eclipse-dot-files/.factorypath
===================================================================
--- archetypes/javaee6-webapp/trunk/eclipse-dot-files/.factorypath 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/eclipse-dot-files/.factorypath 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,5 +1,5 @@
<factorypath>
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.0.0.Final/hibernate-jpamodelgen-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/hibernate-jpamodelgen/1.1.1.Final/hibernate-jpamodelgen-1.1.1.Final.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2011-01-19 22:31:59 UTC (rev 7184)
@@ -22,7 +22,7 @@
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
<arquillian.version>1.0.0.Alpha4</arquillian.version>
- <jboss-javaee6-spec.version>1.0.0.CR1</jboss-javaee6-spec.version>
+ <jboss-javaee6-spec.version>1.0.0.Final</jboss-javaee6-spec.version>
</properties>
<repositories>
@@ -32,14 +32,12 @@
<repository>
<id>jboss-public-repository</id>
<name>JBoss Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <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>
- <enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
@@ -49,15 +47,13 @@
<pluginRepository>
<id>jboss-public-repository</id>
<name>JBoss Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <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>
- <enabled>true</enabled>
<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 -->
- <enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
</pluginRepository>
@@ -67,7 +63,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
- <version>1.0.0.Final</version>
+ <version>1.1.1.Final</version>
<scope>provided</scope>
<!-- Excluded because it's provided by the Java EE 6 dependencies -->
<exclusions>
@@ -78,30 +74,23 @@
</exclusions>
</dependency>
- <!-- Weld Extensions provides convenient, portable CDI extensions such as an injectable logger -->
+ <!-- Seam Solder provides convenient, portable CDI extensions such as an injectable logger -->
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0.Alpha2</version>
+ <groupId>org.jboss.seam.solder</groupId>
+ <artifactId>seam-solder</artifactId>
+ <version>3.0.0.Beta1</version>
</dependency>
- <!-- Need to use the injectable logger in Weld Extensions -->
- <!-- Switch scope to provided if server provides slf4j; JBoss AS provides it; GlassFish provides it if the Hibernate JPA provider is installed -->
+ <!-- Uncomment if deploying to JBoss AS (but not a requirement) -->
+ <!--
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- <scope>compile</scope>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.0.0.Beta4</version>
+ <scope>provided</scope>
</dependency>
+ -->
- <!-- Remove if server provides slf4j; JBoss AS provides it; GlassFish provides it if the Hibernate JPA provider is installed -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.10</version>
- <scope>runtime</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 -->
@@ -133,7 +122,7 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
- <!-- Compiler plugin enforces Java 1.6 compatibility and controls execution of annotation processors -->
+ <!-- Compiler plugin enforces Java 1.6 compatibility and activates annotation processors -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version>
@@ -141,58 +130,7 @@
<source>1.6</source>
<target>1.6</target>
</configuration>
- <executions>
- <execution>
- <id>annotation-processors-only</id>
- <phase>generate-sources</phase>
- <configuration>
- <compilerArgument>-proc:only</compilerArgument>
- <!-- If your app has multiple packages, use this include filter to execute the processor only on the package containing your entities -->
- <!--
- <includes>
- <include>**/model/*.java</include>
- </includes>
- -->
- </configuration>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <!-- This execution gets Eclipse to include all classes in the build path -->
- <id>compile</id>
- <phase>compile</phase>
- <configuration>
- <compilerArgument>-proc:none</compilerArgument>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
</plugin>
- <!-- Build helper plugin adds the sources generated by the JPA 2 annotation processor to the compile path -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/annotations</source>
- </sources>
- </configuration>
- <goals>
- <goal>add-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -235,7 +173,7 @@
<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>
+ <fileName>src/main/resources-jbossas/${project.artifactId}-ds.xml</fileName>
<!-- DataSource needs to go before the application -->
<fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
</fileNames>
@@ -319,7 +257,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>6.0.0.20101110-CR1</version>
+ <version>6.0.0.Final</version>
<type>pom</type>
<scope>test</scope>
</dependency>
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-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/controller/MemberRegistration.java 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,5 +1,6 @@
package com.mycompany.controller;
+import org.jboss.seam.solder.log.Category;
import com.mycompany.data.MemberRepository;
import com.mycompany.model.Member;
import javax.annotation.PostConstruct;
@@ -10,8 +11,9 @@
import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.transaction.UserTransaction;
-import org.slf4j.Logger;
+import org.jboss.logging.Logger;
+
// 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
@@ -19,7 +21,7 @@
@Model
public class MemberRegistration
{
- @Inject
+ @Inject @Category("jboss-javaee6-webapp-src")
private Logger log;
@Inject
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-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberListProducer.java 2011-01-19 22:31:59 UTC (rev 7184)
@@ -43,7 +43,7 @@
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Member> criteria = cb.createQuery(Member.class);
Root<Member> member = criteria.from(Member.class);
- // Uncomment if you would like to try out typesafe criteria queries, a new feature in JPA 2.0
+ // 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/SeedDataImporter.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,5 +1,6 @@
package com.mycompany.data;
+import org.jboss.seam.solder.log.Category;
import com.mycompany.model.Member;
import javax.annotation.PostConstruct;
import javax.ejb.Singleton;
@@ -8,8 +9,9 @@
import javax.persistence.EntityManager;
import javax.persistence.TransactionRequiredException;
import javax.transaction.UserTransaction;
-import org.slf4j.Logger;
+import org.jboss.logging.Logger;
+
/**
* Import seed data into the database on application startup using
* a startup singleton EJB.
@@ -22,7 +24,7 @@
@Singleton
public class SeedDataImporter
{
- @Inject
+ @Inject @Category("jboss-javaee6-webapp-src")
private Logger log;
@Inject
Copied: archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml (from rev 7011, archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml)
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml (rev 0)
+++ archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/application-ds.xml 2011-01-19 22:31:59 UTC (rev 7184)
@@ -0,0 +1,15 @@
+<?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>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>
Deleted: archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/main/resources-jbossas/default-ds.xml 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,15 +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>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/WEB-INF/templates/default.xhtml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-19 22:31:59 UTC (rev 7184)
@@ -14,25 +14,32 @@
<div id="sidebar">
<h3>Find out more</h3>
<p>
- Explore JavaServer Faces.
+ Learn about the Java EE 6 platform and the component model it provides.
</p>
<ul>
- <li><a href="http://www.javaserverfaces.org">JSF community site</a></li>
+ <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>
</ul>
<p>
- Learn more about Java EE 6 and the extensions provided by Weld and Seam.
+ Dive into Weld, the JSR-299 reference implementation, and discover portable extensions Seam 3 offers.
</p>
<ul>
- <li><a href="http://seamframework.org/Weld">Overview</a></li>
- <li><a href="http://seamframework.org">Project site</a></li>
- <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li>
+ <li><a href="http://docs.jboss.org/weld/reference/latest/en-US/html">Weld 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://jira.jboss.org/browse/WELDRAD">Issue tracker</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/Community/Contribute">contributing</a> it back to the
+ consider <a href="http://seamframework.org/Seam3/GetInvolved">contributing</a> it back to the
community!
</p>
</div>
@@ -45,6 +52,9 @@
<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&nam...">Tune
+ logging levels (JBoss AS)</a>
</p>
</div>
</div>
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-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2011-01-19 22:31:59 UTC (rev 7184)
@@ -77,7 +77,7 @@
throw new IllegalArgumentException("Invalid format for qualified artifactId: " + qualifiedArtifactId);
}
- public static File[] resolve(final String... qualifiedArtifactIds)
+ public static File[] resolveAll(final String... qualifiedArtifactIds)
{
int n = qualifiedArtifactIds.length;
File[] artifacts = new File[n];
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-01-13 15:39:22 UTC (rev 7183)
+++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2011-01-19 22:31:59 UTC (rev 7184)
@@ -1,24 +1,26 @@
package com.mycompany.test;
-import com.mycompany.controller.MemberRegistration;
-import com.mycompany.data.MemberRepository;
-import com.mycompany.data.MemberRepositoryProducer;
-import com.mycompany.model.Member;
+import static org.junit.Assert.*;
+
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
-import static org.junit.Assert.*;
import javax.inject.Inject;
+
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.mycompany.controller.MemberRegistration;
+import com.mycompany.data.MemberRepository;
+import com.mycompany.data.MemberRepositoryProducer;
+import com.mycompany.model.Member;
+
@RunWith(Arquillian.class)
public class MemberRegistrationTest
{
@@ -26,11 +28,6 @@
public static Archive<?> createTestArchive() {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class)
- // SLF4J libraries required only if not available on the container classpath
-// .addLibraries(MavenArtifactResolver.resolve(
-// "org.slf4j:slf4j-api:1.5.10",
-// "org.slf4j:slf4j-jdk14:1.5.10"
-// ))
.addManifestResource("test-persistence.xml", "persistence.xml")
.addWebResource(EmptyAsset.INSTANCE, "beans.xml");
}
@@ -54,6 +51,6 @@
@Produces
public Logger produceLog(InjectionPoint injectionPoint)
{
- return LoggerFactory.getLogger(injectionPoint.getMember().getDeclaringClass());
+ return Logger.getLogger(injectionPoint.getMember().getDeclaringClass());
}
}
13 years, 11 months
- 1
- 0