[weld-commits] Weld SVN: r5050 - in extensions/trunk/archetypes/weld-jsf-minimal-jee: src/main/resources/META-INF and 5 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Fri Nov 13 13:50:56 EST 2009
Author: dan.j.allen
Date: 2009-11-13 13:50:55 -0500 (Fri, 13 Nov 2009)
New Revision: 5050
Modified:
extensions/trunk/archetypes/weld-jsf-minimal-jee/
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
Log:
remove servlet stuff so that it runs on JBoss AS 6 cleanly
Property changes on: extensions/trunk/archetypes/weld-jsf-minimal-jee
___________________________________________________________________
Name: svn:ignore
- .settings
.project
+ .project
.settings
target
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/META-INF/archetype.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -4,6 +4,7 @@
<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>
@@ -12,4 +13,4 @@
</sources>
<testSources />
<testResources />
-</archetype>
\ No newline at end of file
+</archetype>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/pom.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -13,6 +13,9 @@
platform dependent!
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file -->
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
</properties>
<dependencyManagement>
<dependencies>
@@ -31,10 +34,12 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- JSF 2.0 -->
<dependency>
@@ -58,7 +63,6 @@
<classifier>jdk15</classifier>
</dependency>
-
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
@@ -111,6 +115,14 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ </configuration>
+ </plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -1,7 +1,10 @@
-<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>
\ No newline at end of file
+<?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
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+ <alternatives/>
+ <decorators/>
+ <interceptors/>
+</beans>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -1,7 +1,5 @@
<?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"/> -->
+ <!-- disable storage of sessions across restarts -->
+ <Manager pathname=""/>
</Context>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -1,7 +1,12 @@
<?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"
+<!-- This file is not required if you don't need any extra configuration. -->
+<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
+
+ <!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. -->
+
+</faces-config>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app 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" version="2.5">
+<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">
- <!-- Standard JSF 2.0 Configuration Paramters. -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</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>
@@ -26,14 +26,4 @@
<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>
- <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>
\ No newline at end of file
+</web-app>
Modified: extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
--- extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-11-13 17:50:09 UTC (rev 5049)
+++ extensions/trunk/archetypes/weld-jsf-minimal-jee/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-11-13 18:50:55 UTC (rev 5050)
@@ -7,8 +7,7 @@
</h:head>
<h:body>
<h1>Does Weld Work?</h1>
- <p>My weld-injected bean says: #{helloWorld.text} in a JSF EL
- dialect.</p>
- <p>You can write the same value using UEL ${helloWorld.text}</p>
+ <p>My weld-injected bean says <span style="color: blue;">#{helloWorld.text}</span> in a JSF EL dialect.</p>
+ <p>You can write the same value using the Unified EL: <span style="color: green;">${helloWorld.text}</span></p>
</h:body>
-</html>
\ No newline at end of file
+</html>
More information about the weld-commits
mailing list