[seam-commits] Seam SVN: r8473 - branches/Seam_2_0/seam-gen/resources/WEB-INF.

Author: dan.j.allen Date: 2008-07-16 13:58:10 -0400 (Wed, 16 Jul 2008) New Revision: 8473 Modified: branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml Log: securityRules is implied fix indenting Modified: branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml =================================================================== --- branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml 2008-07-16 17:54:28 UTC (rev 8472) +++ branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml 2008-07-16 17:58:10 UTC (rev 8473) @@ -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.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd @@ -17,42 +17,40 @@ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.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"/> - + <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-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:identity authenticate-method="#{authenticator.authenticate}" - security-rules="#{securityRules}" - remember-me="true"/> - + <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> + <event type="org.jboss.seam.security.notLoggedIn"> - <action execute="#{redirect.captureCurrentView}"/> + <action execute="#{redirect.captureCurrentView}"/> </event> <event type="org.jboss.seam.security.loginSuccessful"> - <action execute="#{redirect.returnToCapturedView}"/> + <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: branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml =================================================================== --- branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml 2008-07-16 17:54:28 UTC (rev 8472) +++ branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml 2008-07-16 17:58:10 UTC (rev 8473) @@ -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.0.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd @@ -17,39 +17,37 @@ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.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"/> - + <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> - <value>/security.drl</value> - </drools:rule-files> + <drools:rule-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:identity security-rules="#{securityRules}" authenticate-method="#{authenticator.authenticate}" remember-me="true"/> - + <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>