[weld-commits] Weld SVN: r7190 - in archetypes/jsf-weld-servlet-webapp/trunk: src/main/webapp/WEB-INF and 1 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Fri Jan 21 15:41:41 EST 2011
Author: dan.j.allen
Date: 2011-01-21 15:41:40 -0500 (Fri, 21 Jan 2011)
New Revision: 7190
Added:
archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt
archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh
archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml
Removed:
archetypes/jsf-weld-servlet-webapp/trunk/build.sh
Modified:
archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties
archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
archetypes/jsf-weld-servlet-webapp/trunk/readme.txt
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml
archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
- update build
- upgrade Weld
- upgrade Arquillian
- profiles for mojarra and myfaces
- configure for servlet injection in jetty
- use index.jsf trick
Added: archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-excludes.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,10 @@
+*.swp
+.classpath
+.git
+.gitignore
+.project
+.settings
+.svn
+archetype-pom.xml
+archetype-excludes.txt
+release-procedure.txt
Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>12</version>
+ <version>17</version>
</parent>
<groupId>org.jboss.weld.archetypes</groupId>
@@ -13,9 +13,9 @@
<version>1.0.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>JBoss CDI and JSF Servlet Webapp</name>
+ <name>JBoss JSF and CDI Servlet Webapp</name>
- <description>An archetype that generates a basic JSF Servlet webapp project with CDI capabilities</description>
+ <description>An archetype that generates a starter JSF webapp project with CDI capabilities for Servlet containers</description>
<url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
@@ -73,21 +73,21 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk/jsf-weld-servlet-webapp-src/target/archetype</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk/jsf-weld-servlet-webapp-src/target/archetype</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk/jsf-weld-servlet-webapp-src/target/archetype</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-webapp-src/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-webapp-src/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/jsf-weld-servlet-webapp-src/trunk</url>
</scm>
<!-- Uncomment to deploy to central -->
<!--
<distributionManagement>
<repository>
- <id>oss.sonatype.org/jboss-staging</id>
+ <id>central-releases-repository</id>
<name>Sonatype Nexus Maven Repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
- <id>oss.sonatype.org/jboss-snapshots</id>
+ <id>central-snapshots-repository</id>
<name>Sonatype Nexus Snapshot Repository</name>
<url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
</snapshotRepository>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype.properties 2011-01-21 20:41:40 UTC (rev 7190)
@@ -4,6 +4,6 @@
# Java package of the source files; will be replaced with the ${package} expression
archetype.package=com.mycompany
archetype.languages=java
-# value of <artifactId> is converted to ${artifactId} expression in filtered files
-archetype.filteredExtensions=java,txt,html
+# value of <artifactId> element in POM is converted to ${artifactId} expression in filtered files
+archetype.filteredExtensions=java,txt,html,xml
name=JSF and CDI webapp project
Deleted: archetypes/jsf-weld-servlet-webapp/trunk/build.sh
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/build.sh 2011-01-21 20:41:40 UTC (rev 7190)
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# This script generates an archetype into target/archetype from the source project.
-#
-# Two optional commands can be provided (in the order listed):
-#
-# install - which will automatically install the generated archetype in the local repository
-# generate - generate a project from the archetype into target/generated-project
-#
-
-ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
-ARCHETYPE_DIR=target/archetype
-ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
-
-echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
-txt2html -pb 1 -p 2 readme.txt > readme.html
-mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
-echo Relocating generated archetype project to $ARCHETYPE_DIR...
-rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-#rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
-mvn -f $ARCHETYPE_DIR/pom.xml clean
-echo Patching generated archetype...
-# could also use col -b
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i 's;
-;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
-sed -i 's;<name>jboss-jsf-weld-servlet-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-# not sure why the finalName replacement isn't happening
-sed -i 's;<finalName>jboss-jsf-weld-servlet-webapp-src</finalName>;<finalName>${name}</finalName>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-# remove local file that NetBeans add to source project
-rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
-rm -f readme.html
-# could set the release version at this point, if specified
-if [ ! -z $1 ] && [ "$1" = "install" ]; then
- echo Installing archetype...
- shift
- mvn -f $ARCHETYPE_DIR/pom.xml install
-fi
-
-if [ ! -z $1 ] && [ "$1" = "generate" ]; then
- echo Generating project from archetype...
- cd target
- mvn archetype:generate -B -DarchetypeCatalog=local \
- -DarchetypeArtifactId=jboss-jsf-weld-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \
- -DartifactId=generated-project -DgroupId=com.acme -Dversion=1.0.0-SNAPSHOT -Dname="JSF and CDI webapp project"
-fi
Copied: archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh (from rev 7189, archetypes/jsf-weld-servlet-webapp/trunk/build.sh)
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/create-archetype.sh 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# This script generates an archetype into target/archetype from the source project.
+#
+# Two optional commands can be provided (in the order listed):
+#
+# install - which will automatically install the generated archetype in the local repository
+# generate - generate a project from the archetype into target/generated-project
+#
+
+ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
+ARCHETYPE_DIR=target/archetype
+ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
+
+echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
+if [ ! -z `which txt2html` ]; then
+ txt2html -pb 1 -p 2 readme.txt > readme.html
+else
+ echo txt2html cannot be found, skipping generation of readme.html
+fi
+mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
+echo Relocating generated archetype project to $ARCHETYPE_DIR...
+rsync -az --exclude `basename $0` --exclude-from=archetype-excludes.txt $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
+cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
+mvn -f $ARCHETYPE_DIR/pom.xml clean
+echo Patching generated archetype...
+# could also use col -b
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+sed -i 's;
+;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
+sed -i 's;<name>jboss-jsf-weld-servlet-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+# not sure why the finalName replacement isn't happening
+sed -i 's;<finalName>jboss-jsf-weld-servlet-webapp-src</finalName>;<finalName>${name}</finalName>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
+# fix reference to package in web.xml
+#sed -i 's;<param-value>com.mycompany</param-value>;<param-value>${package}</param-value>;' $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/web.xml
+# fix the archetype plugin being an idiot
+find $ARCHETYPE_RESOURCES_DIR -type f -exec sed -i 's;packageInPathFormat;package;g' {} \;
+# remove local file that NetBeans add to source project
+rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
+rm -f readme.html
+# could set the release version at this point, if specified
+if [ ! -z $1 ] && [ "$1" = "install" ]; then
+ echo Installing archetype...
+ shift
+ mvn -f $ARCHETYPE_DIR/pom.xml install
+fi
+
+if [ ! -z $1 ] && [ "$1" = "generate" ]; then
+ echo Generating project from archetype...
+ cd target
+ mvn archetype:generate -B -DarchetypeCatalog=local \
+ -DarchetypeArtifactId=jboss-jsf-weld-servlet-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \
+ -DartifactId=example-project -DgroupId=com.acme -Dpackage=com.acme.example -Dversion=1.0.0-SNAPSHOT -Dname="JSF and CDI webapp project"
+fi
Modified: archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/pom.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -11,14 +11,16 @@
<description>A starter JSF and CDI webapp project that targets Servlet containers, generated from the jboss-jsf-weld-servlet-webapp archetype</description>
<properties>
+ <version.weld-servlet>1.1.0.Final</version.weld-servlet>
+ <version.arquillian>1.0.0.Alpha4</version.arquillian>
+ <version.mojarra>2.0.3</version.mojarra>
+ <version.myfaces>2.0.3</version.myfaces>
+
<!--
Explicitly declaring the source encoding eliminates the following message:
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.weld-servlet>1.1.0.Final</version.weld-servlet>
- <version.arquillian>1.0.0.Alpha4</version.arquillian>
- <version.jsf>2.0.3</version.jsf>
</properties>
<repositories>
@@ -84,75 +86,35 @@
<scope>provided</scope>
</dependency>
- <!-- JAX-RS 1.1 Reference Implementation-->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.4</version>
- </dependency>
-
-
- <!-- FIXME use profiles for Mojarra and MyFaces -->
- <!-- JSF 2.0 API -->
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf}</version>
- </dependency>
-
- <!-- Jetty/Tomcat-specific scopes and artifacts -->
-
- <!-- JSF 2.0 Implementation -->
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
- <version>${version.jsf}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
-
- <!-- SB: Perhaps this is a means of enabling EL 2.0 in tomcat? -->
- <!-- I will uncomment once I have an opportunity to test -->
- <!--
+
+ <!--
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2.1-b04</version>
+ <scope>compile</scope>
</dependency>
- -->
- <!--
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
+ <version>2.2.1-b04</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-->
- <!-- end Jetty/Tomcat-specific scopes and artifacts -->
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- Bean Validation API (JSR 303) -->
<dependency>
<groupId>javax.validation</groupId>
@@ -183,6 +145,7 @@
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<!-- Compiler plugin enforces Java 1.5 compatibility -->
<plugin>
@@ -198,7 +161,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.26</version>
<configuration>
<!-- Delete this block to have Jetty run default port (8080) -->
<connectors>
@@ -240,7 +203,9 @@
<profile>
<id>arq-weld-embedded</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!arquillian</name>
+ </property>
</activation>
<dependencies>
<dependency>
@@ -248,41 +213,86 @@
<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Arquillian Weld EE Embedded requires the EL and EJB 3.1 APIs; Weld runtime provided by weld-servlet -->
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <!-- remove scope if bundling EL libraries w/ webapp -->
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0.0.Final</version>
<scope>test</scope>
</dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Reference Implementation-->
+ <id>mojarra</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.mojarra}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.mojarra}</version>
+ <scope>runtime</scope>
</dependency>
- <!-- JTA and EJB 3.1 APIs are temporary until we figure out what's going on w/ arquillian & weld -->
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- JSF 2.0 Implementation-->
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <dependencies>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>test</scope>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${version.myfaces}</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${version.myfaces}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <!-- JAX-RS 1.1 Reference Implementation-->
+ <id>jersey</id>
+ <activation>
+ <property>
+ <name>!jaxrs</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- TODO add profile for RESTEasy -->
</profiles>
</project>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/readme.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/readme.txt 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/readme.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -1,8 +1,8 @@
+ jboss-jsf-weld-servlet-webapp-src
+ +++++++++++++++++++++++++++++++++
- jboss-jsf-weld-servlet-webapp-src
+ #Source archetype:# jboss-jsf-weld-servlet-webapp
- Source archetype: jboss-jsf-weld-servlet-webapp
-
What is it?
===========
@@ -55,6 +55,15 @@
the container (e.g., the webapps directory of Tomcat). Of course, you also
need to start the container.
+ The default settings use Mojarra 2, the JSF 2 reference implementation. If you
+ want to use MyFaces 2 instead, just add the -Djsf=myfaces flag to any of the
+ commands above.
+
+ mvn jetty:run -Djsf=myfaces
+
+ The application will work just as before, except the JSF functionality will be
+ powered by MyFaces.
+
Importing the project into an IDE
=================================
Added: archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/release-procedure.txt 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,17 @@
+(Assume Q is the qualifier of the release, e.g., Beta1)
+./create-archetype.sh
+cd target/archetype
+vim pom.xml (change 1.0.1-SNAPSHOT to 1.0.1.Q)
+svn import https://svn.jboss.org/repos/weld/archetypes/jsf-weld-servlet-webapp/tags/1.0.1.Q
+cd -
+cd ../tags
+svn update
+cd 1.0.1.Q
+vim pom.xml (change 1.0.1.Q to 1.0.1-SNAPSHOT)
+mvn release:prepare --batch-mode -Drelease -DdevelopmentVersion=1.0.1-SNAPSHOT -DreleaseVersion=1.0.1.Q -Dtag=1.0.1.Q -DdryRun=true
+cp pom.xml.tag pom.xml
+svn commit pom.xml -m "update tag version"
+cp pom.xml.releaseBackup pom.xml
+mvn release:perform nexus:staging-close -Drelease
+svn revert pom.xml
+mvn clean
Added: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/beans.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file is permitted to be empty.
+ The schema definition is provided for your convenience.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/templates/default.xhtml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -14,25 +14,31 @@
<div id="sidebar">
<h3>Find out more</h3>
<p>
- Explore JavaServer Faces.
+ Learn about the CDI programming model.
</p>
<ul>
- <li><a href="http://www.javaserverfaces.org">JSF community site</a></li>
+ <li><a href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299: CDI specification</a></li>
</ul>
<p>
- Learn more about Java EE 6 and the extensions provided by Weld and Seam.
+ Dive into Weld, the JSR-299 reference implementation, and discover portable extensions Seam 3 offers.
</p>
<ul>
- <li><a href="http://seamframework.org/Weld">Overview</a></li>
- <li><a href="http://seamframework.org">Project site</a></li>
- <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceDocumentation">Documentation</a></li>
+ <li><a href="http://docs.jboss.org/weld/reference/latest/en-US/html">Weld reference guide</a></li>
+ <li><a href="http://seamframework.org/Weld">Weld project</a></li>
+ <li><a href="http://seamframework.org/Seam3">Seam 3 project</a></li>
<li><a href="http://seamframework.org/Community/Forums">User forums</a></li>
<li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li>
- <li><a href="https://jira.jboss.org/browse/WELDRAD">Issue tracker</a></li>
+ <li><a href="https://issues.jboss.org/browse/WELDRAD">Archetype issue tracker</a></li>
</ul>
<p>
+ Explore JavaServer Faces, the component-oriented UI framework in Java EE 6.
+ </p>
+ <ul>
+ <li><a href="http://www.javaserverfaces.org">JSF community site</a></li>
+ </ul>
+ <p>
If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and
- consider <a href="http://seamframework.org/Community/Contribute">contributing</a> it back to the
+ consider <a href="http://seamframework.org/Seam3/GetInvolved">contributing</a> it back to the
community!
</p>
</div>
Modified: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-21 03:53:41 UTC (rev 7189)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2011-01-21 20:41:40 UTC (rev 7190)
@@ -11,6 +11,23 @@
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.annotation.SCAN_PACKAGES</param-name>
+ <param-value>com.mycompany</param-value>
+ </context-param>
+
+ <!--
+ <context-param>
+ <param-name>com.sun.faces.expressionFactory</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+ -->
+
<!-- Activate the JSF 2.0 servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
@@ -49,7 +66,7 @@
<servlet-mapping>
<servlet-name>Jersey Web Application</servlet-name>
- <url-pattern>/REST/*</url-pattern>
+ <url-pattern>/rest/*</url-pattern>
</servlet-mapping>
<!-- End Jersey JAX-RS configuration -->
More information about the weld-commits
mailing list