[weld-commits] Weld SVN: r5160 - in archetypes/trunk: jsf and 5 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Sat Nov 28 09:38:13 EST 2009
Author: sboscarine
Date: 2009-11-28 09:38:13 -0500 (Sat, 28 Nov 2009)
New Revision: 5160
Added:
archetypes/trunk/jsf/jee-full/
archetypes/trunk/jsf/jee-minimal/
archetypes/trunk/jsf/servlet-minimal/
Removed:
archetypes/trunk/jsf/jee/
archetypes/trunk/jsf/servlet/
Modified:
archetypes/trunk/jsf/jee-full/pom.xml
archetypes/trunk/jsf/jee-full/src/main/resources/archetype-resources/pom.xml
archetypes/trunk/jsf/jee-minimal/pom.xml
archetypes/trunk/jsf/servlet-minimal/pom.xml
archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
archetypes/trunk/pom.xml
Log:
refactor to start JSF full
Copied: archetypes/trunk/jsf/jee-full (from rev 5159, archetypes/trunk/jsf/jee)
Modified: archetypes/trunk/jsf/jee-full/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/jsf/jee-full/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -10,9 +10,9 @@
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
- <artifactId>weld-jsf-minimal-jee</artifactId>
+ <artifactId>weld-jsf-jee</artifactId>
<description>JSF 2.0 and Weld 1.0 on Jave EE 6 containers like JBoss 6.0</description>
- <name>Java EE/JSF Archetype for Weld</name>
+ <name>Weld JEE6 Archetype</name>
<packaging>maven-archetype</packaging>
Modified: archetypes/trunk/jsf/jee-full/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/jsf/jee-full/src/main/resources/archetype-resources/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -91,6 +91,55 @@
</exclusions>
</dependency>
+
+
+ <!-- JPA Dependencies. -->
+ <!-- Dan, should this be provided? -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </dependency>
+ <!-- Dan, should this be provided? -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.6.ga</version>
+ <!-- why? -->
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Dan, should this be provided? -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+ <!-- Dan, should this be provided? -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>c3p0</groupId>-->
+<!-- <artifactId>c3p0</artifactId>-->
+<!-- <version>0.9.1.2</version>-->
+<!-- </dependency>-->
+ <!-- Hypersonic in-memory database. Replace with a driver that reflects your database. -->
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+
+
+
+
+
</dependencies>
<build>
<finalName>${artifactId}</finalName>
Copied: archetypes/trunk/jsf/jee-minimal (from rev 5159, archetypes/trunk/jsf/jee)
Modified: archetypes/trunk/jsf/jee-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -10,9 +10,9 @@
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
- <artifactId>weld-jsf-minimal-jee</artifactId>
- <description>JSF 2.0 and Weld 1.0 on Jave EE 6 containers like JBoss 6.0</description>
- <name>Java EE/JSF Archetype for Weld</name>
+ <artifactId>weld-jsf-jee-minimal</artifactId>
+ <description>JSF 2.0 and Weld 1.0 on Jave EE 6 containers like JBoss 6.0. Does not include persistence. </description>
+ <name>Weld JEE6 Minimal Archteype</name>
<packaging>maven-archetype</packaging>
Copied: archetypes/trunk/jsf/servlet-minimal (from rev 5159, archetypes/trunk/jsf/servlet)
Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
- <artifactId>weld-jsf-minimal-servlet</artifactId>
+ <artifactId>weld-jsf-servlet-minimal</artifactId>
<name>Servlet/JSF Archetype for Weld</name>
<description>JSF 2.0 and Weld 1.0 on Servlet Containers such as Tomcat 6 and Jetty 6</description>
Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -161,7 +161,28 @@
<scanIntervalSeconds>3</scanIntervalSeconds>
</configuration>
</plugin>
-
+ <!-- Cargo - deploys to Tomcat using command 'mvn clean package cargo:redeploy'. -->
+<plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat6x</containerId>
+ <type>remote</type>
+ </container>
+ <configuration>
+ <type>runtime</type>
+ <properties>
+ <!-- Declare a tomcat.user and tomcat.password in your settings file -->
+ <cargo.remote.username>${tomcat.username}</cargo.remote.username>
+ <cargo.remote.password>${tomcat.password}</cargo.remote.password>
+ <!--defaults to localhost:8080-->
+ <!--<cargo.hostname>localhost</cargo.hostname>-->
+ <!--<cargo.servlet.port>8080</cargo.servlet.port>-->
+ </properties>
+ </configuration>
+ </configuration>
+</plugin>
</plugins>
</build>
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-25 22:12:40 UTC (rev 5159)
+++ archetypes/trunk/pom.xml 2009-11-28 14:38:13 UTC (rev 5160)
@@ -42,9 +42,9 @@
</developers>
<modules>
- <module>jsf/servlet</module>
- <!-- Exclude the Java EE version for now, it is not ready yet -->
-<!-- <module>jsf/jee</module>-->
+ <module>jsf/servlet-minimal</module>
+ <module>jsf/jee-minimal</module>
+ <module>jsf/jee-full</module>
</modules>
<!-- SCM and distribution management -->
More information about the weld-commits
mailing list