Author: dan.j.allen Date: 2008-11-24 12:07:49 -0500 (Mon, 24 Nov 2008) New Revision: 9614 Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml trunk/seam-gen/icefaces/resources/WEB-INF/components.xml trunk/seam-gen/icefaces/resources/WEB-INF/web.xml trunk/seam-gen/resources/WEB-INF/components-war.xml trunk/seam-gen/resources/WEB-INF/components.xml trunk/seam-gen/resources/WEB-INF/web.xml Log: whitespace Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml =================================================================== --- trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -7,54 +7,54 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/> - + <component scope="APPLICATION" auto-create="true" name="renderManager" class="com.icesoft.faces.async.render.RenderManager" /> - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> <component name="org.jboss.seam.debug.hotDeployFilter"> <property name="urlPattern">*.seam</property> </component> - + <persistence:managed-persistence-context name="entityManager" auto-create="true" entity-manager-factory="#{@projectName@EntityManagerFactory}"/> - <persistence:entity-manager-factory name="@projectName@EntityManagerFactory" + <persistence:entity-manager-factory name="@projectName@EntityManagerFactory" persistence-unit-name="@projectName@"/> - + <drools:rule-base name="securityRules"> <drools:rule-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:rule-based-permission-resolver security-rules="#{securityRules}"/> + <security:rule-based-permission-resolver security-rules="#{securityRules}"/> <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> - + <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> </event> <event type="org.jboss.seam.security.loginSuccessful"> <action execute="#{redirect.returnToCapturedView}"/> </event> - + <!-- For use with jBPM pageflow or process management --> - <!-- + <!-- <bpm:jbpm> <bpm:process-definitions></bpm:process-definitions> <bpm:pageflow-definitions></bpm:pageflow-definitions> </bpm:jbpm> --> - + </components> Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components.xml =================================================================== --- trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -7,26 +7,26 @@ xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/> - + <component scope="APPLICATION" auto-create="true" name="renderManager" class="com.icesoft.faces.async.render.RenderManager" /> - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> <component name="org.jboss.seam.debug.hotDeployFilter"> <property name="urlPattern">*.seam</property> </component> - + <persistence:managed-persistence-context name="entityManager" auto-create="true" persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> @@ -37,23 +37,23 @@ </drools:rule-files> </drools:rule-base> - <security:rule-based-permission-resolver security-rules="#{securityRules}"/> - + <security:rule-based-permission-resolver security-rules="#{securityRules}"/> + <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> - + <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> </event> <event type="org.jboss.seam.security.loginSuccessful"> <action execute="#{redirect.returnToCapturedView}"/> </event> - + <!-- For use with jBPM pageflow or process management --> - <!-- + <!-- <bpm:jbpm> <bpm:process-definitions></bpm:process-definitions> <bpm:pageflow-definitions></bpm:pageflow-definitions> </bpm:jbpm> --> - + </components> Modified: trunk/seam-gen/icefaces/resources/WEB-INF/web.xml =================================================================== --- trunk/seam-gen/icefaces/resources/WEB-INF/web.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/icefaces/resources/WEB-INF/web.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -3,59 +3,59 @@ 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"> - + <!-- Seam (using Icefaces) generated project--> - - <!-- listeners required for this application --> + + <!-- listeners required for this application --> <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> - + <listener> <listener-class>com.icesoft.faces.util.event.servlet.ContextEventRepeater</listener-class> </listener> - + <!-- filters --> <filter> <filter-name>Seam Filter</filter-name> <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> </filter> - + <filter-mapping> <filter-name>Seam Filter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> </context-param> - + <!-- Facelets development mode (disable in production) --> <context-param> <param-name>facelets.DEVELOPMENT</param-name> <param-value>@debug@</param-value> </context-param> - + <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> </context-param> - + <context-param> <param-name>com.icesoft.faces.actionURLSuffix</param-name> <param-value>.seam</param-value> </context-param> - + <context-param> <param-name>com.icesoft.faces.synchronousUpdate</param-name> <param-value>false</param-value> </context-param> - <context-param> + <context-param> <param-name>com.icesoft.faces.doJSFStateManagement</param-name> <param-value>true</param-value> - </context-param> + </context-param> <context-param> <param-name>org.icesoft.examples.serverClock</param-name> @@ -66,19 +66,19 @@ <param-name>com.icesoft.faces.standardRequestScope</param-name> <param-value>true</param-value> </context-param> - + <!-- servlets --> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> - + <servlet> <servlet-name>Seam Resource Servlet</servlet-name> <servlet-class>org.jboss.seam.servlet.ResourceServlet</servlet-class> </servlet> - + <servlet> <servlet-name>Persistent Faces Servlet</servlet-name> <servlet-class>com.icesoft.faces.webapp.xmlhttp.PersistentFacesServlet</servlet-class> @@ -88,32 +88,32 @@ <servlet-name>Blocking Servlet</servlet-name> <servlet-class>com.icesoft.faces.webapp.xmlhttp.BlockingServlet</servlet-class> <load-on-startup> 1 </load-on-startup> - </servlet> - + </servlet> + <!-- servlet mappings --> <servlet-mapping> <servlet-name>Persistent Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> </servlet-mapping> - + <servlet-mapping> <servlet-name>Persistent Faces Servlet</servlet-name> <url-pattern>/xmlhttp/*</url-pattern> </servlet-mapping> - + <!-- Blocking Servlet Mapping --> <servlet-mapping> <servlet-name>Blocking Servlet</servlet-name> <url-pattern>/block/*</url-pattern> </servlet-mapping> - + <servlet-mapping> <servlet-name>Seam Resource Servlet</servlet-name> <url-pattern>/seam/resource/*</url-pattern> </servlet-mapping> - - <security-constraint> + + <security-constraint> <display-name>Restrict raw XHTML Documents</display-name> <web-resource-collection> <web-resource-name>XHTML</web-resource-name> @@ -121,5 +121,5 @@ </web-resource-collection> <auth-constraint/> </security-constraint> - + </web-app> Modified: trunk/seam-gen/resources/WEB-INF/components-war.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -8,8 +8,8 @@ xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd @@ -21,42 +21,42 @@ <component name="org.jboss.seam.debug.hotDeployFilter"> <property name="urlPattern">*.seam</property> </component> - - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> - + <persistence:managed-persistence-context name="entityManager" auto-create="true" entity-manager-factory="#{@projectName@EntityManagerFactory}"/> - <persistence:entity-manager-factory name="@projectName@EntityManagerFactory" + <persistence:entity-manager-factory name="@projectName@EntityManagerFactory" persistence-unit-name="@projectName@"/> - + <drools:rule-base name="securityRules"> <drools:rule-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:rule-based-permission-resolver security-rules="#{securityRules}"/> + <security:rule-based-permission-resolver security-rules="#{securityRules}"/> <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> - + <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> </event> <event type="org.jboss.seam.security.loginSuccessful"> <action execute="#{redirect.returnToCapturedView}"/> </event> - + <mail:mail-session host="localhost" port="2525" username="test" password="test" /> - + <!-- For use with jBPM pageflow or process management --> - <!-- + <!-- <bpm:jbpm> <bpm:process-definitions></bpm:process-definitions> <bpm:pageflow-definitions></bpm:pageflow-definitions> </bpm:jbpm> --> - + </components> Modified: trunk/seam-gen/resources/WEB-INF/components.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/components.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/resources/WEB-INF/components.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -8,8 +8,8 @@ xmlns:mail="http://jboss.com/products/seam/mail" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd @@ -17,20 +17,20 @@ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/> - - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" conversation-id-parameter="cid" parent-conversation-id-parameter="pid"/> - + <component name="org.jboss.seam.debug.hotDeployFilter"> <property name="urlPattern">*.seam</property> </component> <persistence:managed-persistence-context name="entityManager" auto-create="true" - persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> + persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> <drools:rule-base name="securityRules"> <drools:rule-files> @@ -38,25 +38,25 @@ </drools:rule-files> </drools:rule-base> - <security:rule-based-permission-resolver security-rules="#{securityRules}"/> - + <security:rule-based-permission-resolver security-rules="#{securityRules}"/> + <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> - + <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> </event> <event type="org.jboss.seam.security.loginSuccessful"> <action execute="#{redirect.returnToCapturedView}"/> </event> - + <mail:mail-session host="localhost" port="2525" username="test" password="test" /> - + <!-- For use with jBPM pageflow or process management --> - <!-- + <!-- <bpm:jbpm> <bpm:process-definitions></bpm:process-definitions> <bpm:pageflow-definitions></bpm:pageflow-definitions> </bpm:jbpm> --> - + </components> Modified: trunk/seam-gen/resources/WEB-INF/web.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/web.xml 2008-11-24 17:06:36 UTC (rev 9613) +++ trunk/seam-gen/resources/WEB-INF/web.xml 2008-11-24 17:07:49 UTC (rev 9614) @@ -1,11 +1,11 @@ <?xml version="1.0" ?> <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" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> <!-- RichFaces --> - + <context-param> <param-name>org.richfaces.SKIN</param-name> <param-value>@skin@</param-value> @@ -34,13 +34,13 @@ <param-name>org.richfaces.LoadScriptStrategy</param-name> <param-value>ALL</param-value> </context-param> - + <!-- Seam --> - + <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> - + <filter> <filter-name>Seam Filter</filter-name> <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> @@ -50,26 +50,26 @@ <filter-name>Seam Filter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + <servlet> <servlet-name>Seam Resource Servlet</servlet-name> <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> </servlet> - + <servlet-mapping> <servlet-name>Seam Resource Servlet</servlet-name> <url-pattern>/seam/resource/*</url-pattern> </servlet-mapping> - + <!-- Facelets development mode (disable in production) --> - + <context-param> <param-name>facelets.DEVELOPMENT</param-name> <param-value>true</param-value> </context-param> - + <!-- JSF --> - + <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> @@ -80,13 +80,13 @@ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> - + <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> </servlet-mapping> - - <security-constraint> + + <security-constraint> <display-name>Restrict raw XHTML Documents</display-name> <web-resource-collection> <web-resource-name>XHTML</web-resource-name> @@ -94,5 +94,5 @@ </web-resource-collection> <auth-constraint/> </security-constraint> - + </web-app>