7:37 p.m.
Author: dan.j.allen
Date: 2009-04-23 20:37:22 -0400 (Thu, 23 Apr 2009)
New Revision: 2619
Modified:
examples/trunk/tomcat/WebContent/META-INF/context.xml
examples/trunk/tomcat/WebContent/WEB-INF/faces-config.xml
examples/trunk/tomcat/WebContent/WEB-INF/web.xml
Log:
formatting and whitespace
Modified: examples/trunk/tomcat/WebContent/META-INF/context.xml
===================================================================
--- examples/trunk/tomcat/WebContent/META-INF/context.xml 2009-04-24 00:37:10 UTC (rev
2618)
+++ examples/trunk/tomcat/WebContent/META-INF/context.xml 2009-04-24 00:37:22 UTC (rev
2619)
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<Context>
- <Resource name="app/Manager" auth="Container"
- type="javax.inject.manager.Manager"
- factory="org.jboss.webbeans.resources.ManagerObjectFactory"/>
-<!-- Uncomment to enable injection into Servlet -->
-<!-- <Listener
className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener"
/>-->
-
-
+ <Resource name="app/Manager"
+ auth="Container"
+ type="javax.inject.manager.Manager"
+ factory="org.jboss.webbeans.resources.ManagerObjectFactory"/>
+ <!-- Uncomment to enable injection into Servlet -->
+ <!-- <Listener
className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener"/>
-->
</Context>
Modified: examples/trunk/tomcat/WebContent/WEB-INF/faces-config.xml
===================================================================
--- examples/trunk/tomcat/WebContent/WEB-INF/faces-config.xml 2009-04-24 00:37:10 UTC (rev
2618)
+++ examples/trunk/tomcat/WebContent/WEB-INF/faces-config.xml 2009-04-24 00:37:22 UTC (rev
2619)
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="1.2"
- 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_1_2.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config 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_1_2.xsd"
+ version="1.2">
- <application>
- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application>
</faces-config>
Modified: examples/trunk/tomcat/WebContent/WEB-INF/web.xml
===================================================================
--- examples/trunk/tomcat/WebContent/WEB-INF/web.xml 2009-04-24 00:37:10 UTC (rev 2618)
+++ examples/trunk/tomcat/WebContent/WEB-INF/web.xml 2009-04-24 00:37:22 UTC (rev 2619)
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<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">
+<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">
<display-name>Web Beans Numberguess example</display-name>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <listener>
+
<listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
+ </listener>
- <!-- JSF -->
-
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -19,31 +25,15 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
-
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
<session-config>
<session-timeout>10</session-timeout>
</session-config>
-
- <listener>
-
<listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class>
- </listener>
<resource-env-ref>
- <description>
- Object factory for the JCDI Manager
- </description>
- <resource-env-ref-name>
- app/Manager
- </resource-env-ref-name>
- <resource-env-ref-type>
- javax.inject.manager.Manager
- </resource-env-ref-type>
+ <description>Object factory for the JCDI Manager</description>
+ <resource-env-ref-name>app/Manager</resource-env-ref-name>
+
<resource-env-ref-type>javax.inject.manager.Manager</resource-env-ref-type>
</resource-env-ref>
-
</web-app>