[weld-commits] Weld SVN: r5018 - in extensions/trunk/archetypes/weld-jsf-minimal: src/main/resources/META-INF and 4 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Nov 12 22:11:52 EST 2009
Author: sboscarine
Date: 2009-11-12 22:11:52 -0500 (Thu, 12 Nov 2009)
New Revision: 5018
Modified:
extensions/trunk/archetypes/weld-jsf-minimal/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
Log:
formatting updates
Modified: extensions/trunk/archetypes/weld-jsf-minimal/pom.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/pom.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/pom.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,34 +1,35 @@
<?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>Archetype for JSF 2.0 and Weld 1.0</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 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 2.0 and Weld 1.0 on Servlet Containers like Tomcat 6 and Jetty 6</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>
Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/META-INF/archetype.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,17 +1,17 @@
<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/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>
+ <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/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>
\ No newline at end of file
Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,149 +1,149 @@
<?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 and scopes for dependency 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>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- <!-- JSF 2.0 -->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
+ 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 and scopes for dependency 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>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </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 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>
+ <!-- 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 -->
+ <!-- Jetty/Tomcat-specific scopes and artifacts -->
- <!-- JSF 2.0 -->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
+ <!-- JSF 2.0 -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- end Jetty/Tomcat-specific scopes and artifacts -->
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- end Jetty/Tomcat-specific scopes and artifacts -->
- <!-- Sun 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>-->
- <!-- Additional Bean Validation Validation Dependency-->
- <!--<dependency>-->
- <!-- <groupId>org.slf4j</groupId>-->
- <!-- <artifactId>slf4j-log4j12</artifactId>-->
- <!-- <version>1.4.2</version>-->
- <!--</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>
+ <!-- Sun 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>-->
+ <!-- Additional Bean Validation Validation Dependency-->
+ <!--<dependency>-->
+ <!-- <groupId>org.slf4j</groupId>-->
+ <!-- <artifactId>slf4j-log4j12</artifactId>-->
+ <!-- <version>1.4.2</version>-->
+ <!--</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>
- <!-- 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>
+ <!-- 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>
\ No newline at end of file
Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <alternatives />
- <decorators />
- <interceptors />
+ <alternatives />
+ <decorators />
+ <interceptors />
</beans>
Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context>
- <Manager pathname="" /> <!-- disables storage of sessions across restarts -->
- <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"/> -->
+ <Manager pathname="" /> <!-- disables storage of sessions across restarts -->
+ <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>
Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 03:08:25 UTC (rev 5017)
+++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 03:11:52 UTC (rev 5018)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- This file is optional. It can be deleted at any time. -->
-<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
+ <!-- This file is optional. It can be deleted at any time. -->
+<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">
</faces-config>
\ No newline at end of file
More information about the weld-commits
mailing list