[weld-commits] Weld SVN: r5116 - in archetypes/trunk: weld-jsf-minimal and 7 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Mon Nov 23 13:30:08 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-23 13:30:08 -0500 (Mon, 23 Nov 2009)
New Revision: 5116
Modified:
archetypes/trunk/pom.xml
archetypes/trunk/weld-jsf-minimal-jee/pom.xml
archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml
archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml
archetypes/trunk/weld-jsf-minimal/pom.xml
archetypes/trunk/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
Log:
a few updates
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/pom.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -2,48 +2,56 @@
<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>5</version>
+ <version>7-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.weld.archetype</groupId>
+
+ <groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1-BETA-SNAPSHOT</version>
- <name>Weld Parent Archetype</name>
- <description>This POM is the future home of configuration common to all archetypes.</description>
- <url>http://sfwk.org/Documentation/WeldArchetypeProposal</url>
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/extensions/trunk/archetypes</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/extensions/trunk/archetypes</developerConnection>
- <!-- This is an invalid URL -->
- <!-- <url>http://fisheye.jboss.org/browse/Weld</url>-->
- </scm>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
+ <name>Weld Archetypes</name>
+ <description>Aggregator and parent to all Weld Archetypes</description>
+ <url>http://www.seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
+
+
<developers>
<developer>
<name>Steven Boscarine</name>
<roles>
- <role>Developer</role>
- <role>Volunteer</role>
+ <role>Archetypes lead</role>
</roles>
<email>steven.boscarine at childrens.harvard.edu</email>
<organization>Children's Hospital Boston: Informatics Program</organization>
<organizationUrl>http://chip.org/</organizationUrl>
<url>http://info.rmatics.org/</url>
</developer>
+ <developer>
+ <name>Pete Muir</name>
+ <roles>
+ <role>Project lead</role>
+ </roles>
+ <email>pete.muir at jboss.org</email>
+ <organization>JBoss, a division of Red Hat</organization>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
</developers>
- <dependencies />
- <properties>
- <!--
- eliminates [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>
+
<modules>
<module>weld-jsf-minimal</module>
- <module>weld-jsf-minimal-jee</module>
+ <!-- Exclude the Java EE version for now, it is not ready yet -->
+<!-- <module>weld-jsf-minimal-jee</module>-->
</modules>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk</url>
+ </scm>
+
</project>
Modified: archetypes/trunk/weld-jsf-minimal/pom.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal/pom.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal/pom.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -2,15 +2,21 @@
<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.archetype</groupId>
+ <groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1-BETA-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>weld-jsf-minimal</artifactId>
- <name>jsf-minimal</name>
- <description>JSF 2.0 and Weld 1.0 on Servlet Containers like Tomcat 6 and Jetty 6</description>
+
+ <groupId>org.jboss.weld.archetypes</groupId>
+ <artifactId>weld-jsf-minimal-servlet</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>
+
<packaging>maven-archetype</packaging>
+
<build>
<extensions>
<!-- TODO: Explain what I do. -->
@@ -22,14 +28,8 @@
<plugins>
<!-- TODO: Explain what I do. -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <!--
- Ommitting a version throws this error: [WARNING] Rule 1:
- org.apache.maven.plugins.enforcer.RequirePluginVersions failed with message: Some plugins are missing
- valid versions:(LATEST RELEASE SNAPSHOT are not allowed )
- -->
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
</plugin>
</plugins>
</build>
Modified: archetypes/trunk/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>weld-archetype-servlet-quickstart</id>
<resources>
Modified: archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -7,38 +7,47 @@
<packaging>war</packaging>
<name>${artifactId}</name>
<version>${version}</version>
+
<properties>
<!--
eliminates [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>
+
+ <!-- The version of Weld extensions in use -->
+ <weld.extensions.version>1.0.0-CR2</weld.extensions.version>
</properties>
+
<dependencyManagement>
<dependencies>
<!-- Import scope will provide versions for dependencies below. -->
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-bom</artifactId>
- <version>1.0.0-CR2</version>
+ <version>${weld.extensions.version}</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>
- <!-- JSF 2.0 -->
+
+ <!-- JSF 2.0 API -->
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
@@ -100,22 +109,25 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- end Jetty/Tomcat-specific scopes and artifacts -->
+
</dependencies>
+
<build>
<finalName>${artifactId}</finalName>
<plugins>
- <!-- Compiler plugin enforces Java 1.6 -->
+ <!-- Compiler plugin enforces Java 1.5 compatibility -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <!-- Eclipse plugin enforces download of source and JavaDoc jars -->
+ <!-- Eclipse plugin - download source and JavaDoc jars automatically -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -125,6 +137,7 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
+
<!-- Embedded Jetty (jetty:run) -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -138,13 +151,19 @@
</connectors>
<!-- force friendly name instead of artifact name + version -->
<contextPath>${build.finalName}</contextPath>
- <!-- Where the BeanManager is constructed. This is where you'll declare datasources. -->
+ <!-- Where the BeanManager is constructed. This is where you'll declare datasources.
+-->
<jettyEnvXml>\${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. -->
+ <!-- You can save changes in a file or class and refresh your browser to view the changes.
+-->
<scanIntervalSeconds>3</scanIntervalSeconds>
</configuration>
</plugin>
+
</plugins>
+
</build>
+
</project>
Modified: archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -3,6 +3,6 @@
<!-- 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 Servlet -->
+ <!-- Uncomment to enable injection into Servlets, Servlet Listeners and Filters in Tomcat -->
<!-- <Listener className="org.jboss.weld.environment.tomcat.WeldLifecycleListener"/> -->
</Context>
Modified: archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -7,6 +7,6 @@
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. -->
+ <!-- Write your navigation rules here. You should use CDI for creating @Named managed beans! -->
</faces-config>
Modified: archetypes/trunk/weld-jsf-minimal-jee/pom.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal-jee/pom.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal-jee/pom.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -3,14 +3,19 @@
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.archetype</groupId>
+ <groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1-BETA-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
+ <groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-minimal-jee</artifactId>
- <description>JSF 2.0 and Weld 1.0 on JEE6 containers like JBoss 6.0</description>
- <name>jsf-minimal-jee</name>
+ <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>
+
<packaging>maven-archetype</packaging>
+
<build>
<extensions>
<!-- TODO: Explain what I do. -->
@@ -22,15 +27,10 @@
<plugins>
<!-- TODO: Explain what I do. -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <!--
- Ommitting a version throws this error: [WARNING] Rule 1:
- org.apache.maven.plugins.enforcer.RequirePluginVersions failed with message: Some plugins are missing
- valid versions:(LATEST RELEASE SNAPSHOT are not allowed )
- -->
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
</plugin>
</plugins>
</build>
+
</project>
Modified: archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>weld-archetype-servlet-quickstart</id>
<resources>
Modified: archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml 2009-11-23 17:24:55 UTC (rev 5115)
+++ archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml 2009-11-23 18:30:08 UTC (rev 5116)
@@ -7,6 +7,7 @@
<packaging>war</packaging>
<name>${artifactId}</name>
<version>${version}</version>
+
<properties>
<!--
eliminates [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is
@@ -16,14 +17,15 @@
<!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file -->
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
+ <weld.api.version>1.0</weld.api.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Import scope will provide versions for dependencies below. -->
<dependency>
<groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions-bom</artifactId>
- <version>1.0.0-CR2</version>
+ <artifactId>weld-api-bom</artifactId>
+ <version>${weld.api.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -46,12 +48,12 @@
<artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Provided on JBoss AS, not necessarily Java EE 6 -->
+ <!-- Provided on JBoss AS, not necessarily Java EE 6. Useful to give you extra built in constraints! -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<!-- JSF 2.0 -->
<dependency>
@@ -77,6 +79,7 @@
<classifier>jdk15</classifier>
</dependency>
+ <!-- Needed on JBoss AS as EL is out of date -->
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
@@ -92,26 +95,28 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
- <!-- Compiler plugin enforces Java 1.6 -->
+ <!-- Compiler plugin enforces Java 1.5 compatiblity -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <!-- Eclipse plugin enforces download of source and JavaDoc jars -->
+ <!-- Eclipse plugin can force download of source and JavaDoc jars -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
+<!-- <downloadSources>true</downloadSources>-->
+<!-- <downloadJavadocs>true</downloadJavadocs>-->
</configuration>
</plugin>
+
+ <!-- Configure the JBoss Maven deploy plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-maven-plugin</artifactId>
More information about the weld-commits
mailing list