[weld-commits] Weld SVN: r7189 - in archetypes/jsf-weld-servlet-webapp/trunk: src/main/webapp/WEB-INF and 1 other directory.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2011-01-20 22:53:41 -0500 (Thu, 20 Jan 2011)
New Revision: 7189

Added:
   archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml
Modified:
   archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
   archetypes/jsf-weld-servlet-webapp/trunk/build.sh
   archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
   archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
- upgrade Weld
- add central dist repo
- add jetty configuration


Modified: archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml	2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/archetype-pom.xml	2011-01-21 03:53:41 UTC (rev 7189)
@@ -77,4 +77,20 @@
     <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>
   </scm>
+
+  <!-- Uncomment to deploy to central -->
+  <!--
+  <distributionManagement>
+    <repository>
+      <id>oss.sonatype.org/jboss-staging</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>
+      <name>Sonatype Nexus Snapshot Repository</name>
+      <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+  -->
 </project>

Modified: archetypes/jsf-weld-servlet-webapp/trunk/build.sh
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/build.sh	2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/build.sh	2011-01-21 03:53:41 UTC (rev 7189)
@@ -27,6 +27,8 @@
 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

Modified: archetypes/jsf-weld-servlet-webapp/trunk/pom.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/pom.xml	2011-01-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/pom.xml	2011-01-21 03:53:41 UTC (rev 7189)
@@ -16,7 +16,7 @@
          [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.0.1-Final</version.weld-servlet>
+      <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>
@@ -244,12 +244,8 @@
          </activation>
          <dependencies>
             <dependency>
-               <groupId>org.jboss.arquillian.container</groupId>
+               <groupId>org.jboss.weld.arquillian.container</groupId>
                <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-               <!-- temporary until we figure out what's going on w/ arquillian & weld
-               <version>${version.arquillian}</version>
-               -->
-               <version>1.0.0.Alpha3</version>
                <scope>test</scope>
             </dependency>
             <dependency>

Added: archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml
===================================================================
--- archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml	                        (rev 0)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/jetty-web.xml	2011-01-21 03:53:41 UTC (rev 7189)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
+   <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
+      <Arg><Ref id="webAppCtx"/></Arg>
+   </Call>
+</Configure>

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-20 07:50:56 UTC (rev 7188)
+++ archetypes/jsf-weld-servlet-webapp/trunk/src/main/webapp/WEB-INF/web.xml	2011-01-21 03:53:41 UTC (rev 7189)
@@ -53,12 +53,21 @@
    </servlet-mapping>
    <!-- End Jersey JAX-RS configuration -->
 
-
-
    <resource-env-ref>
       <description>Object factory for the CDI Bean Manager</description>
       <resource-env-ref-name>BeanManager</resource-env-ref-name>
       <resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type>
    </resource-env-ref>
 
+   <!-- Enable this security constraint if you are using *.jsf as your Faces Servlet mapping -->
+   <!--
+   <security-constraint>
+      <display-name>Restrict direct access to Facelets views</display-name>
+      <web-resource-collection>
+         <web-resource-name>Facelets views</web-resource-name>
+         <url-pattern>*.xhtml</url-pattern>
+      </web-resource-collection>
+      <auth-constraint/>
+   </security-constraint>
+   -->
 </web-app>