[weld-commits] Weld SVN: r5128 - in archetypes/trunk: jsf and 8 other directories.

Author: pete.muir(a)jboss.org Date: 2009-11-24 06:37:59 -0500 (Tue, 24 Nov 2009) New Revision: 5128 Added: archetypes/trunk/jsf/ archetypes/trunk/jsf/jee/ archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet/ archetypes/trunk/jsf/servlet/pom.xml archetypes/trunk/jsf/servlet/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml Removed: archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet/pom.xml archetypes/trunk/jsf/servlet/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml archetypes/trunk/weld-jsf-minimal-jee/ archetypes/trunk/weld-jsf-minimal/ Modified: archetypes/trunk/pom.xml Log: move stuff around, remove snapshot ref Copied: archetypes/trunk/jsf/jee (from rev 5115, archetypes/trunk/weld-jsf-minimal-jee) Deleted: archetypes/trunk/jsf/jee/pom.xml =================================================================== --- archetypes/trunk/weld-jsf-minimal-jee/pom.xml 2009-11-23 17:24:55 UTC (rev 5115) +++ archetypes/trunk/jsf/jee/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.weld.archetype</groupId> - <artifactId>weld-archetype-parent</artifactId> - <version>0.0.1-BETA-SNAPSHOT</version> - </parent> - <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> - <packaging>maven-archetype</packaging> - <build> - <extensions> - <!-- TODO: Explain what I do. --> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - </extension> - </extensions> - <plugins> - <!-- TODO: Explain what I do. --> - <plugin> - <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> Copied: archetypes/trunk/jsf/jee/pom.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal-jee/pom.xml) =================================================================== --- archetypes/trunk/jsf/jee/pom.xml (rev 0) +++ archetypes/trunk/jsf/jee/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,36 @@ +<?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.archetypes</groupId> + <artifactId>weld-archetype-parent</artifactId> + <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 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. --> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + </extension> + </extensions> + <plugins> + <!-- TODO: Explain what I do. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project> Deleted: archetypes/trunk/jsf/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/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,16 +0,0 @@ -<archetype> - <id>weld-archetype-servlet-quickstart</id> - <resources> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/index.jsp</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - </sources> - <testSources /> - <testResources /> -</archetype> Copied: archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml) =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype> + <id>weld-archetype-servlet-quickstart</id> + <resources> + <resource>src/main/webapp/index.xhtml</resource> + <resource>src/main/webapp/index.jsp</resource> + <resource>src/main/webapp/WEB-INF/web.xml</resource> + <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> + <resource>src/main/resources/META-INF/beans.xml</resource> + <resource>src/main/webapp/META-INF/context.xml</resource> + </resources> + <sources> + <source>src/main/java/HelloWorld.java</source> + </sources> + <testSources /> + <testResources /> +</archetype> Deleted: archetypes/trunk/jsf/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/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <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> - <!-- 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> - </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> - <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.validation</groupId> - <artifactId>validation-api</artifactId> - <scope>provided</scope> - </dependency> - <!-- Provided on JBoss AS, not necessarily Java EE 6 --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.0.GA</version> - <scope>provided</scope> - </dependency> - <!-- JSF 2.0 --> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Optional, but pretty useful. --> - <!-- - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - --> - - <!-- Optional, but highly recommended. --> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <plugins> - <!-- Compiler plugin enforces Java 1.6 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <!-- Eclipse plugin enforces 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> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml) =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,130 @@ +<?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> + <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> + <!-- 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-api-bom</artifactId> + <version>${weld.api.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> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <scope>provided</scope> + </dependency> + <!-- 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>runtime</scope> + </dependency> + <!-- JSF 2.0 --> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Optional, but pretty useful. --> + <!-- + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + --> + + <!-- Optional, but highly recommended. --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + + <!-- Needed on JBoss AS as EL is out of date --> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + <build> + <finalName>${artifactId}</finalName> + <plugins> + <!-- Compiler plugin enforces Java 1.5 compatiblity --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + <!-- 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>--> + </configuration> + </plugin> + + <!-- Configure the JBoss Maven deploy plugin --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + </configuration> + </plugin> + </plugins> + </build> +</project> Copied: archetypes/trunk/jsf/servlet (from rev 5115, archetypes/trunk/weld-jsf-minimal) Deleted: archetypes/trunk/jsf/servlet/pom.xml =================================================================== --- archetypes/trunk/weld-jsf-minimal/pom.xml 2009-11-23 17:24:55 UTC (rev 5115) +++ archetypes/trunk/jsf/servlet/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.weld.archetype</groupId> - <artifactId>weld-archetype-parent</artifactId> - <version>0.0.1-BETA-SNAPSHOT</version> - </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> - <packaging>maven-archetype</packaging> - <build> - <extensions> - <!-- TODO: Explain what I do. --> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - </extension> - </extensions> - <plugins> - <!-- TODO: Explain what I do. --> - <plugin> - <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> Copied: archetypes/trunk/jsf/servlet/pom.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal/pom.xml) =================================================================== --- archetypes/trunk/jsf/servlet/pom.xml (rev 0) +++ archetypes/trunk/jsf/servlet/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,36 @@ +<?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.archetypes</groupId> + <artifactId>weld-archetype-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <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. --> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + </extension> + </extensions> + <plugins> + <!-- TODO: Explain what I do. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-archetype-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> Deleted: archetypes/trunk/jsf/servlet/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/jsf/servlet/src/main/resources/META-INF/archetype.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,18 +0,0 @@ -<archetype> - <id>weld-archetype-servlet-quickstart</id> - <resources> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/index.jsp</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - </sources> - <testSources /> - <testResources> - <resource>src/test/resources/jetty-env.xml</resource> - </testResources> -</archetype> Copied: archetypes/trunk/jsf/servlet/src/main/resources/META-INF/archetype.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml) =================================================================== --- archetypes/trunk/jsf/servlet/src/main/resources/META-INF/archetype.xml (rev 0) +++ archetypes/trunk/jsf/servlet/src/main/resources/META-INF/archetype.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype> + <id>weld-archetype-servlet-quickstart</id> + <resources> + <resource>src/main/webapp/index.xhtml</resource> + <resource>src/main/webapp/index.jsp</resource> + <resource>src/main/webapp/WEB-INF/web.xml</resource> + <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> + <resource>src/main/resources/META-INF/beans.xml</resource> + <resource>src/main/webapp/META-INF/context.xml</resource> + </resources> + <sources> + <source>src/main/java/HelloWorld.java</source> + </sources> + <testSources /> + <testResources> + <resource>src/test/resources/jetty-env.xml</resource> + </testResources> +</archetype> Deleted: archetypes/trunk/jsf/servlet/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/jsf/servlet/src/main/resources/archetype-resources/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <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> - </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> - <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 --> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <!-- Optional, but pretty useful. --> - <!-- - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - --> - - <!-- Optional, but highly recommended. --> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - - <!-- Jetty/Tomcat-specific scopes and artifacts --> - - <!-- JSF 2.0 --> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <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 --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.0.GA</version> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- end Jetty/Tomcat-specific scopes and artifacts --> - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <plugins> - <!-- Compiler plugin enforces Java 1.6 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <!-- Eclipse plugin enforces 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> - </configuration> - </plugin> - <!-- Embedded Jetty (jetty:run) --> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <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>${build.finalName}</contextPath> - <!-- 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. --> - <scanIntervalSeconds>3</scanIntervalSeconds> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml) =================================================================== --- archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml (rev 0) +++ archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,169 @@ +<?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> + <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>${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 API --> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <!-- Optional, but pretty useful. --> + <!-- + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + --> + + <!-- Optional, but highly recommended. --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + + <!-- Jetty/Tomcat-specific scopes and artifacts --> + + <!-- JSF 2.0 --> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <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 --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.0.GA</version> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- end Jetty/Tomcat-specific scopes and artifacts --> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <!-- Compiler plugin enforces Java 1.5 compatibility --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + <!-- Eclipse plugin - download source and JavaDoc jars automatically --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <wtpversion>2.0</wtpversion> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + </configuration> + </plugin> + + <!-- Embedded Jetty (jetty:run) --> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <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>${build.finalName}</contextPath> + <!-- 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. +--> + <scanIntervalSeconds>3</scanIntervalSeconds> + </configuration> + </plugin> + + </plugins> + + </build> + +</project> Deleted: archetypes/trunk/jsf/servlet/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/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,8 +0,0 @@ -<?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 Servlet --> - <!-- <Listener className="org.jboss.weld.environment.tomcat.WeldLifecycleListener"/> --> -</Context> Copied: archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml) =================================================================== --- archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml (rev 0) +++ archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,8 @@ +<?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> Deleted: archetypes/trunk/jsf/servlet/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/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -1,12 +0,0 @@ -<?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> Copied: archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (from rev 5116, archetypes/trunk/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml) =================================================================== --- archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ archetypes/trunk/jsf/servlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -0,0 +1,12 @@ +<?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 should use CDI for creating @Named managed beans! --> + +</faces-config> Modified: archetypes/trunk/pom.xml =================================================================== --- archetypes/trunk/pom.xml 2009-11-23 22:41:27 UTC (rev 5127) +++ archetypes/trunk/pom.xml 2009-11-24 11:37:59 UTC (rev 5128) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>7-SNAPSHOT</version> + <version>7</version> </parent> <groupId>org.jboss.weld.archetypes</groupId> @@ -42,9 +42,9 @@ </developers> <modules> - <module>weld-jsf-minimal</module> + <module>jsf/servlet</module> <!-- Exclude the Java EE version for now, it is not ready yet --> -<!-- <module>weld-jsf-minimal-jee</module>--> +<!-- <module>jsf/jee</module>--> </modules> <!-- SCM and distribution management -->