[richfaces-svn-commits] JBoss Rich Faces SVN: r13698 - trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Mon Apr 20 10:55:34 EDT 2009 

Author: msorokin
Date: 2009-04-20 10:55:34 -0400 (Mon, 20 Apr 2009)
New Revision: 13698

Removed:
   trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia
Modified:
   trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/
   trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml
   trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml
   trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
Log:
updated files



Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF
___________________________________________________________________
Name: svn:ignore
   + .faces-config.xml.jsfdia


Deleted: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia	2009-04-20 14:54:12 UTC (rev 13697)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia	2009-04-20 14:55:34 UTC (rev 13698)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<diagram model-entity="SeamPagesDiagram">
- <item ID="*" NAME="*" PATH="*" SHAPE="24,17,0,0" TYPE="page" model-entity="SeamPagesDiagramItem">
-  <output ID="/home.xhtml" NAME="output" PATH="/home.xhtml"
-   TARGET="#xhome.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="org.jboss.seam.framework.EntityNotFoundException"
-  NAME="exception:org.jboss.seam.framework.EntityNotFoundException"
-  PATH="org.jboss.seam.framework.EntityNotFoundException"
-  SHAPE="24,121,0,0" TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="javax.persistence.EntityNotFoundException"
-  NAME="exception:javax.persistence.EntityNotFoundException"
-  PATH="javax.persistence.EntityNotFoundException" SHAPE="24,225,0,0"
-  TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="javax.persistence.OptimisticLockException"
-  NAME="exception:javax.persistence.OptimisticLockException"
-  PATH="javax.persistence.OptimisticLockException" SHAPE="24,329,0,0"
-  TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="org.jboss.seam.security.AuthorizationException"
-  NAME="exception:org.jboss.seam.security.AuthorizationException"
-  PATH="org.jboss.seam.security.AuthorizationException"
-  SHAPE="24,433,0,0" TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="org.jboss.seam.security.NotLoggedInException"
-  NAME="exception:org.jboss.seam.security.NotLoggedInException"
-  PATH="org.jboss.seam.security.NotLoggedInException" SHAPE="24,745,0,0"
-  TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/login.xhtml" NAME="output" PATH="/login.xhtml"
-   TARGET="#xlogin.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item ID="javax.faces.application.ViewExpiredException"
-  NAME="exception:javax.faces.application.ViewExpiredException"
-  PATH="javax.faces.application.ViewExpiredException" SHAPE="24,537,0,0"
-  TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item NAME="exception:" SHAPE="24,641,0,0" TYPE="exception" model-entity="SeamPagesDiagramItem">
-  <output ID="/error.xhtml" NAME="output" PATH="/error.xhtml"
-   TARGET="#xerror.xhtml" model-entity="SeamPagesDiagramItemOutput"/>
- </item>
- <item NAME="#xhome.xhtml" PATH="/home.xhtml" SHAPE="344,17,0,0"
-  TYPE="page" model-entity="SeamPagesDiagramItem"/>
- <item NAME="#xlogin.xhtml" PATH="/login.xhtml" SHAPE="344,745,0,0"
-  TYPE="page" model-entity="SeamPagesDiagramItem"/>
- <item NAME="#xerror.xhtml" PATH="/error.xhtml" SHAPE="472,121,0,0"
-  TYPE="page" model-entity="SeamPagesDiagramItem"/>
-</diagram>

Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml	2009-04-20 14:54:12 UTC (rev 13697)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml	2009-04-20 14:55:34 UTC (rev 13698)
@@ -22,18 +22,18 @@
                  conversation-timeout="120000" 
                  conversation-id-parameter="cid"/>
     
-   <persistence:managed-persistence-context name="entityManager"
-                                     auto-create="true"
-                      persistence-unit-jndi-name="java:/helloworldEntityManagerFactory"/>  
-
+  
 <drools:rule-base name="securityRules">
        <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 security-rules="#{securityRules}" 
+   authenticate-method="#{authenticator.authenticate()}" remember-me="true"/>
+
    
+   
    <event type="org.jboss.seam.security.notLoggedIn">
        <action execute="#{redirect.captureCurrentView}"/>
    </event>

Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml	2009-04-20 14:54:12 UTC (rev 13697)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml	2009-04-20 14:55:34 UTC (rev 13698)
@@ -132,13 +132,16 @@
   <managed-bean-class>org.docs.tree.Shelf</managed-bean-class>
   <managed-bean-scope>session</managed-bean-scope>
  </managed-bean>
- 
-<managed-bean>
+ <managed-bean>
   <managed-bean-name>hujations</managed-bean-name>
   <managed-bean-class>org.docs.tree.Hujations</managed-bean-class>
   <managed-bean-scope>request</managed-bean-scope>
  </managed-bean>
- 
+ <managed-bean>
+  <managed-bean-name>authentification</managed-bean-name>
+  <managed-bean-class>org.docs.authentification.Authentification</managed-bean-class>
+  <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
  <application>
   <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
   <locale-config>
@@ -150,4 +153,5 @@
    <supported-locale>tr</supported-locale>
   </locale-config>
  </application>
+ <!-- JSF-security method-->
 </faces-config>

Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml	2009-04-20 14:54:12 UTC (rev 13697)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml	2009-04-20 14:55:34 UTC (rev 13698)
@@ -121,6 +121,35 @@
 
 
 
+<security-constraint>
+	<web-resource-collection>
+	<web-resource-name>Protected Pages</web-resource-name>
+	<url-pattern>/isuserinrole.xhtml</url-pattern>
+	</web-resource-collection>
+	<auth-constraint>
+	<role-name>admin</role-name>
+	</auth-constraint>
+</security-constraint>
 
+<login-config>
+<auth-method>FORM</auth-method>
+<realm-name>openldap</realm-name>
+<form-login-config>
+<form-login-page>/login.xhtml</form-login-page>
+<form-error-page>/noauth.xhtml</form-error-page>
+</form-login-config>
+</login-config>
 
+
+<security-role>
+<role-name>user</role-name>
+</security-role>
+
+<security-role>
+<role-name>admin</role-name>
+</security-role>
+
+
+
+
 </web-app>

More information about the richfaces-svn-commits mailing list