Weld SVN: r5170 - in archetypes/trunk: jsf/jee and 2 other directories.
by weld-commits＠lists.jboss.org
Author: sboscarine
Date: 2009-11-28 12:41:34 -0500 (Sat, 28 Nov 2009)
New Revision: 5170
Modified:
archetypes/trunk/jsf/jee-minimal/pom.xml
archetypes/trunk/jsf/jee/pom.xml
archetypes/trunk/jsf/servlet-minimal/pom.xml
archetypes/trunk/pom.xml
Log:
manually updated version number
Modified: archetypes/trunk/jsf/jee/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-11-28 17:39:53 UTC (rev 5169)
+++ archetypes/trunk/jsf/jee/pom.xml 2009-11-28 17:41:34 UTC (rev 5170)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/jsf/jee-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 17:39:53 UTC (rev 5169)
+++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 17:41:34 UTC (rev 5170)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 17:39:53 UTC (rev 5169)
+++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 17:41:34 UTC (rev 5170)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-28 17:39:53 UTC (rev 5169)
+++ archetypes/trunk/pom.xml 2009-11-28 17:41:34 UTC (rev 5170)
@@ -27,7 +27,7 @@
</repositories>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Weld Archetypes</name>
14 years, 5 months
Weld SVN: r5169 - archetypes/tags.
by weld-commits＠lists.jboss.org
Author: sboscarine
Date: 2009-11-28 12:39:53 -0500 (Sat, 28 Nov 2009)
New Revision: 5169
Added:
archetypes/tags/0.0.1/
Log:
mvn release:prepare failed. Finishing up manually
Copied: archetypes/tags/0.0.1 (from rev 5168, archetypes/trunk)
14 years, 5 months
Weld SVN: r5168 - in archetypes/trunk: jsf/jee and 2 other directories.
by weld-commits＠lists.jboss.org
Author: sboscarine
Date: 2009-11-28 12:32:28 -0500 (Sat, 28 Nov 2009)
New Revision: 5168
Modified:
archetypes/trunk/jsf/jee-minimal/pom.xml
archetypes/trunk/jsf/jee/pom.xml
archetypes/trunk/jsf/servlet-minimal/pom.xml
archetypes/trunk/pom.xml
Log:
[maven-release-plugin] prepare release weld-archetype-parent-0.0.1
Modified: archetypes/trunk/jsf/jee/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
+++ archetypes/trunk/jsf/jee/pom.xml 2009-11-28 17:32:28 UTC (rev 5168)
@@ -1,21 +1,20 @@
<?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">
+<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>0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-jee</artifactId>
<description>JSF 2.0 and Weld 1.0 on Jave EE 6 containers like JBoss 6.0</description>
<name>Weld JEE6 Archetype</name>
-
+
<packaging>maven-archetype</packaging>
-
+
<build>
<extensions>
<!-- TODO: Explain what I do. -->
@@ -32,5 +31,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: archetypes/trunk/jsf/jee-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
+++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 17:32:28 UTC (rev 5168)
@@ -1,21 +1,20 @@
<?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">
+<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>0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-jsf-jee-minimal</artifactId>
<description>JSF 2.0 and Weld 1.0 on Jave EE 6 containers like JBoss 6.0. Does not include persistence. </description>
<name>Weld JEE6 Minimal Archteype</name>
-
+
<packaging>maven-archetype</packaging>
-
+
<build>
<extensions>
<!-- TODO: Explain what I do. -->
@@ -32,5 +31,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
+++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 17:32:28 UTC (rev 5168)
@@ -1,12 +1,11 @@
<?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">
+<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>0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
+++ archetypes/trunk/pom.xml 2009-11-28 17:32:28 UTC (rev 5168)
@@ -1,8 +1,6 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
@@ -29,7 +27,7 @@
</repositories>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
<packaging>pom</packaging>
<name>Weld Archetypes</name>
@@ -67,8 +65,8 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/tags/weld-archetyp...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/tags/weld-archetype-p...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/archetypes/tags/weld-archetype-paren...</url>
</scm>
</project>
\ No newline at end of file
14 years, 5 months
Weld SVN: r5167 - in archetypes/trunk: jsf/jee and 2 other directories.
by weld-commits＠lists.jboss.org
Author: sboscarine
Date: 2009-11-28 11:26:20 -0500 (Sat, 28 Nov 2009)
New Revision: 5167
Modified:
archetypes/trunk/jsf/jee-minimal/pom.xml
archetypes/trunk/jsf/jee/pom.xml
archetypes/trunk/jsf/servlet-minimal/pom.xml
archetypes/trunk/pom.xml
Log:
updated version number
Modified: archetypes/trunk/jsf/jee/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/pom.xml 2009-11-28 16:15:38 UTC (rev 5166)
+++ archetypes/trunk/jsf/jee/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/jsf/jee-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 16:15:38 UTC (rev 5166)
+++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 16:15:38 UTC (rev 5166)
+++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-28 16:15:38 UTC (rev 5166)
+++ archetypes/trunk/pom.xml 2009-11-28 16:26:20 UTC (rev 5167)
@@ -2,19 +2,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
<version>7</version>
</parent>
-<repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
+ <repositories>
<repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ <repository>
<id>snapshots.jboss.org</id>
<name>JBoss Snapshots Repository</name>
<url>http://snapshots.jboss.org/maven2</url>
@@ -26,17 +26,17 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
-</repositories>
+ </repositories>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<name>Weld Archetypes</name>
<description>Aggregator and parent to all Weld Archetypes</description>
<url>http://www.seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
-
-
+
+
<developers>
<developer>
<name>Steven Boscarine</name>
@@ -58,18 +58,17 @@
<url>http://in.relation.to/Bloggers/Pete</url>
</developer>
</developers>
-
+
<modules>
<module>jsf/servlet-minimal</module>
<module>jsf/jee-minimal</module>
<module>jsf/jee</module>
</modules>
-
+
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk</developerConnection>
<url>http://fisheye.jboss.org/browse/weld/archetypes/trunk</url>
</scm>
-
-</project>
+</project>
\ No newline at end of file
14 years, 5 months
Weld SVN: r5166 - in archetypes/trunk: jsf and 1 other directory.
by weld-commits＠lists.jboss.org
Author: sboscarine
Date: 2009-11-28 11:15:38 -0500 (Sat, 28 Nov 2009)
New Revision: 5166
Added:
archetypes/trunk/jsf/jee/
Removed:
archetypes/trunk/jsf/jee-full/
Modified:
archetypes/trunk/pom.xml
Log:
changed folder name to reflect archetype
Copied: archetypes/trunk/jsf/jee (from rev 5164, archetypes/trunk/jsf/jee-full)
Modified: archetypes/trunk/pom.xml
===================================================================
--- archetypes/trunk/pom.xml 2009-11-28 16:14:32 UTC (rev 5165)
+++ archetypes/trunk/pom.xml 2009-11-28 16:15:38 UTC (rev 5166)
@@ -8,7 +8,25 @@
<artifactId>weld-parent</artifactId>
<version>7</version>
</parent>
-
+<repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+</repositories>
<groupId>org.jboss.weld.archetypes</groupId>
<artifactId>weld-archetype-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -44,7 +62,7 @@
<modules>
<module>jsf/servlet-minimal</module>
<module>jsf/jee-minimal</module>
- <module>jsf/jee-full</module>
+ <module>jsf/jee</module>
</modules>
<!-- SCM and distribution management -->
14 years, 5 months
Weld SVN: r5165 - archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-28 11:14:32 -0500 (Sat, 28 Nov 2009)
New Revision: 5165
Modified:
archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
Log:
codehaus tomcat plugin
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-11-28 15:54:16 UTC (rev 5164)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-28 16:14:32 UTC (rev 5165)
@@ -150,39 +150,32 @@
</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.
--->
+ <contextPath>${project.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.
--->
+ <!-- You can save changes in a file or class and refresh your browser to view the changes. -->
<scanIntervalSeconds>3</scanIntervalSeconds>
</configuration>
</plugin>
- <!-- Cargo - deploys to Tomcat using command 'mvn clean package cargo:redeploy'. -->
-<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <configuration>
- <container>
- <containerId>tomcat6x</containerId>
- <type>remote</type>
- </container>
- <configuration>
- <type>runtime</type>
- <properties>
- <!-- Declare a tomcat.user and tomcat.password in your settings file -->
- <cargo.remote.username>${tomcat.username}</cargo.remote.username>
- <cargo.remote.password>${tomcat.password}</cargo.remote.password>
- <!--defaults to localhost:8080-->
- <!--<cargo.hostname>localhost</cargo.hostname>-->
- <!--<cargo.servlet.port>8080</cargo.servlet.port>-->
- </properties>
- </configuration>
- </configuration>
-</plugin>
+
+ <!-- Embedded Tomcat (package tomcat:run) -->
+ <!-- Standalone Tomcat (package tomcat:deploy) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <path>/${project.build.finalName}</path>
+ <!-- Embedded port -->
+ <port>9090</port>
+ <!--
+ The default authentication credentials for remote deployment are username "admin" with no password
+ To override credentials, define a server in settings.xml and activate it using the <server> element
+ -->
+ <url>http://localhost:8080/manager</url>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
14 years, 5 months
Weld SVN: r5164 - archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-28 10:54:16 -0500 (Sat, 28 Nov 2009)
New Revision: 5164
Modified:
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Log:
whitespace and comment
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-11-28 15:52:21 UTC (rev 5163)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-28 15:54:16 UTC (rev 5164)
@@ -6,7 +6,7 @@
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 -->
+ <!-- Activate the JSF 2.0 servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -19,8 +19,8 @@
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <!-- This is an optional parameter, but it makes troubleshooting errors much easier. -->
- <!-- You may want to delete it before final deployment -->
+ <!-- This is an optional parameter, but it makes troubleshooting errors much easier -->
+ <!-- You are advised to delete this context parameter before a production deployment -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
14 years, 5 months
Weld SVN: r5163 - in archetypes/trunk/jsf: servlet-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-28 10:52:21 -0500 (Sat, 28 Nov 2009)
New Revision: 5163
Modified:
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
Log:
Remove empty child elements. Autocomplete should provide that help just fine.
Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-28 15:48:12 UTC (rev 5162)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-28 15:52:21 UTC (rev 5163)
@@ -1,10 +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">
- <alternatives/>
- <decorators/>
- <interceptors/>
</beans>
Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-28 15:48:12 UTC (rev 5162)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-28 15:52:21 UTC (rev 5163)
@@ -1,10 +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">
- <alternatives/>
- <decorators/>
- <interceptors/>
</beans>
14 years, 5 months
Weld SVN: r5162 - archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-28 10:48:12 -0500 (Sat, 28 Nov 2009)
New Revision: 5162
Modified:
archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml
Log:
fix missing version for glassfish el (needs to be fixed upstream)
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-11-28 15:43:24 UTC (rev 5161)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-28 15:48:12 UTC (rev 5162)
@@ -83,6 +83,9 @@
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
+ <scope>runtime</scope>
+ <!-- FIXME this version should be in the Weld API BOM -->
+ <version>2.1.2-b04</version>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
14 years, 5 months
Weld SVN: r5161 - archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-28 10:43:24 -0500 (Sat, 28 Nov 2009)
New Revision: 5161
Modified:
archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Log:
whitespace and comments
Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-28 14:38:13 UTC (rev 5160)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-28 15:43:24 UTC (rev 5161)
@@ -2,40 +2,40 @@
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
+ 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 -->
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Tell the context which URLs to send through JSF -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <!-- This is an optional parameter, but it makes troubleshooting errors much easier. -->
- <!-- You may want to delete it before final deployment -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
+
+ <!-- Activate the JSF 2.0 servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Tell the context which URLs to send through JSF -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <!-- This is an optional parameter, but it makes troubleshooting errors much easier -->
+ <!-- You are advised to remove this context parameter before a production deployment -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
- <!-- Weld Jetty/Tomcat specific configuration parameters -->
- <!-- Both the listener and resource-env-ref tags can be deleted in JEE6 containers. -->
- <listener>
- <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
- </listener>
+ <!-- Weld Jetty/Tomcat specific configuration parameters -->
+ <!-- *** The <listener> and <resource-env-ref> elements can be deleted when running in a Java EE 6 container *** -->
+ <listener>
+ <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
+ </listener>
- <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>
+ <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>
</web-app>
14 years, 5 months