Author: dan.j.allen Date: 2009-11-13 13:52:35 -0500 (Fri, 13 Nov 2009) New Revision: 5051 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/webapp/META-INF/context.xml 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/web.xml Log: formatting 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 18:50:55 UTC (rev 5050) +++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-11-13 18:52:35 UTC (rev 5051) @@ -1,8 +1,10 @@ <?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 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/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 18:50:55 UTC (rev 5050) +++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/META-INF/context.xml 2009-11-13 18:52:35 UTC (rev 5051) @@ -1,7 +1,8 @@ <?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" /> + <!-- disable storage of sessions across restarts --> + <Manager pathname=""/> + <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"/> --> + <!-- <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 18:50:55 UTC (rev 5050) +++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2009-11-13 18:52:35 UTC (rev 5051) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- 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" +<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"> Modified: extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-13 18:50:55 UTC (rev 5050) +++ extensions/trunk/archetypes/weld-jsf-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-11-13 18:52:35 UTC (rev 5051) @@ -1,6 +1,10 @@ <?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"> <!-- Activate the JSF 2.0 servlet --> <servlet> @@ -27,9 +31,11 @@ <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>