[weld-commits] Weld SVN: r5315 - in archetypes/trunk/jsf: jee/src/main/resources/META-INF/maven and 18 other directories.

Author: dan.j.allen Date: 2009-12-16 23:42:20 -0500 (Wed, 16 Dec 2009) New Revision: 5315 Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png Removed: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp Log: switch to using modern archetype descriptor set default version for projects to 1.0.0-SNAPSHOT setting welcome-file to index.jsf does not work consistently, so revert propagate template to servlet-minimal from jee-minimal update template to include links to JSF community site and description of Weld add embedded glassfish plugin to jee-minimal Deleted: archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype> - <id>weld-archetype-jee-quickstart</id> - <resources> - <resource>src/main/resources/import.sql</resource> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/resources/META-INF/persistence.xml</resource> - <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/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - <source>src/main/java/Widget.java</source> - <source>src/main/java/WidgetListProducer.java</source> - <source>src/main/java/WidgetRepository.java</source> - <source>src/main/java/WidgetRepositoryProducer.java</source> - </sources> - <testSources /> - <testResources /> -</archetype> Added: archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-jee"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.sql</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -27,6 +27,17 @@ <!-- The version of Weld extensions in use --> <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + + <repositories> + <!-- Several key Java EE APIs and RIs are missing from the Maven Central Repository --> + <!-- The goal is to eventually eliminate the reliance on the JBoss repository --> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <dependencyManagement> <dependencies> <!-- Import scope will provide versions for dependencies below. --> Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -37,8 +37,4 @@ <persistence-unit-name>widgets</persistence-unit-name> </persistence-unit-ref> - <!-- Optional. Sets default document name. --> - <welcome-file-list> - <welcome-file>index.jsf</welcome-file> - </welcome-file-list> </web-app> Added: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,12 @@ +package ${package}; + +import org.testng.annotations.Test; + +public class HelloWorldTest +{ + @Test + public void testGetText() { + HelloWorld fixture = new HelloWorld(); + assert "Hello World!".equals(fixture.getText()); + } +} Deleted: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype> - <id>weld-archetype-jee-minimal-quickstart</id> - <resources> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/resources/css/screen.css</resource> - <resource filtered="false">src/main/webapp/resources/gfx/banner.png</resource> - <resource filtered="false">src/main/webapp/resources/gfx/weld.png</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/webapp/WEB-INF/tmpl/default.xhtml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - </sources> - <testSources> - <source>src/test/java/HelloWorldTest.java</source> - </testSources> - <testResources/> -</archetype> Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-jee-minimal"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -25,6 +25,26 @@ <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + + <repositories> + <!-- Several key Java EE APIs and RIs are missing from the Maven Central Repository --> + <!-- The goal is to eventually eliminate the reliance on the JBoss repository --> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> + <!-- GlassFish repository required for embedded-glassfish plugin --> + <pluginRepository> + <id>glassfish</id> + <name>GlassFish Maven 2 Repository</name> + <url>http://download.java.net/maven/glassfish</url> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> <!-- Import scope will provide versions for dependencies below. --> @@ -37,6 +57,7 @@ </dependency> </dependencies> </dependencyManagement> + <dependencies> <!-- CDI (JSR-299) --> <dependency> @@ -132,6 +153,17 @@ <serverName>${expr_start}jboss.domain${expr_end}</serverName> </configuration> </plugin> + <!-- Configure the Embedded GlassFish Maven plugin (for using embedded-glassfish:run) --> + <plugin> + <groupId>org.glassfish</groupId> + <artifactId>maven-embedded-glassfish-plugin</artifactId> + <version>3.0</version> + <configuration> + <app>target/${expr_start}build.finalName${expr_end}.war</app> + <port>7070</port> + <containerType>web</containerType> + </configuration> + </plugin> </plugins> </build> </project> Copied: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates (from rev 5312, archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl) Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml 2009-12-17 01:17:12 UTC (rev 5312) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -12,13 +12,19 @@ <div id="container"> <div id="content"> <div id="sidebar"> - <h3>Learn more</h3> + <h3>Find out more</h3> <p> + Explore JavaServer Faces. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> Learn more about Java EE 6 and the extensions provided by Weld and Seam. </p> <ul> <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">O... - <li><a href="http://seamframework.org">Project website</a></li> + <li><a href="http://seamframework.org">Project site</a></li> <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-Wel... <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> @@ -36,7 +42,10 @@ </div> <div id="footer"> <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> - <p>Weld is an open source (Apache License, Version 2.0) implementation of CDI.</p> + <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> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,19 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Uncomment if you're using Glassfish. JBoss 6.0.0.M1 doesn't yet support Servlet 3.0. This is anticipated to be - fixed very soon. - --> - <!-- - <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"> - --> -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<!-- + If you're using GlassFish V3, you can update the version attribute to 3.0 and the schema document to web-app_3_0.xsd + JBoss AS 6.0.0.M1 does not support Servlet 3.0 (expected in 6.0.0.M2) +--> +<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"> <!-- Activate the JSF 2.0 servlet --> + <!-- The JSF servlet declaration and mapping are not required for GlassFish V3 --> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> @@ -33,8 +31,4 @@ <param-value>true</param-value> </context-param> - <!-- Optional. Sets default document name. --> - <welcome-file-list> - <welcome-file>index.jsf</welcome-file> - </welcome-file-list> </web-app> Copied: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (from rev 5312, archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml) =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -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" action="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/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1 @@ +<% response.sendRedirect("home.jsf"); %> Deleted: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,49 +0,0 @@ -<?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/tmpl/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" action="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> Deleted: archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,21 +0,0 @@ -<?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> - <source>src/test/java/HelloWorldTest.java</source> - </testSources> - <testResources> - <resource>src/test/resources/jetty-env.xml</resource> - </testResources> -</archetype> Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-servlet-minimal"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -22,6 +22,16 @@ <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + <repositories> + <!-- Several key Java EE APIs and RIs are missing from the Maven Central Repository --> + <!-- The goal is to eventually eliminate the reliance on the JBoss repository --> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <dependencyManagement> <dependencies> <!-- Import scope will provide versions for dependencies below. --> Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,52 @@ +<!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> + Explore JavaServer Faces. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> + Learn more about Java EE 6 and the extensions provided by Weld and Seam. + </p> + <ul> + <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">O... + <li><a href="http://seamframework.org">Project site</a></li> + <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-Wel... + <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/jira/browse/WELD">Issue tracker</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">contrib... 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> Copied: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (from rev 5312, archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml) =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -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" action="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> Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,5 +1 @@ -<html> -<head> -<meta HTTP-EQUIV="REFRESH" content="0; url=index.jsf"> -</head> -</html> +<% response.sendRedirect("home.jsf"); %> Deleted: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html"> - <h:head> - <title>Weld JSF/Servlet Starter Application</title> - </h:head> - <h:body> - <h1>Hello World!</h1> - <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p> - - <h:form> - <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" style="color: red;"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="numbers" value="Numbers (max two digits):"/> - </th> - <td> - <h:inputText id="numbers" value="#{helloWorld.numbers}"/> - <h:message for="numbers" style="color: red;"/> - </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" style="color: red;"/> - </td> - </tr> - </table> - <p> - <h:commandButton action="check" value="Check"/> - <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> - </p> - </h:form> - </h:body> -</html> Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,39 @@ +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; +} +code { + font-size: 1.1em; +} +span.invalid { + padding-left: 3px; + color: red; +} \ No newline at end of file Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png =================================================================== (Binary files differ) Property changes on: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png =================================================================== (Binary files differ) Property changes on: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream