5:05 a.m.
Author: msorokin
Date: 2009-06-04 06:05:27 -0400 (Thu, 04 Jun 2009)
New Revision: 14472
Modified:
branches/community/3.3.X/test-applications/richfaces-docs/src/main/java/org/docs/richfaces/Editor.java
branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml
Log:
Modified:
branches/community/3.3.X/test-applications/richfaces-docs/src/main/java/org/docs/richfaces/Editor.java
===================================================================
---
branches/community/3.3.X/test-applications/richfaces-docs/src/main/java/org/docs/richfaces/Editor.java 2009-06-04
00:49:57 UTC (rev 14471)
+++
branches/community/3.3.X/test-applications/richfaces-docs/src/main/java/org/docs/richfaces/Editor.java 2009-06-04
10:05:27 UTC (rev 14472)
@@ -3,7 +3,21 @@
public class Editor {
String edit;
+
+ private String pageText = "Lorem ipsum dolor sit amet, consectetur adipisicing
elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
deserunt mollit anim id est laborum.";
+
+
+
+
+ public String getPageText() {
+ return pageText;
+ }
+
+ public void setPageText(String pageText) {
+ this.pageText = pageText;
+ }
+
public String getEdit() {
return edit;
}
Modified:
branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml
===================================================================
---
branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml 2009-06-04
00:49:57 UTC (rev 14471)
+++
branches/community/3.3.X/test-applications/richfaces-docs/src/main/webapp/WEB-INF/web.xml 2009-06-04
10:05:27 UTC (rev 14472)
@@ -1,75 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Archetype Created Web Application</display-name>
- <context-param>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config.xml</param-value>
- </context-param>
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
- </context-param>
-
- <context-param>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <context-param>
<param-name>org.richfaces.queue.global.enabled</param-name>
<param-value>#{globalQueue.globalQueue}</param-value>
-
</context-param>
-
-
- <context-param>
+ <context-param>
<param-name>org.richfaces.SKIN</param-name>
<param-value>#{skin.skin}</param-value>
</context-param>
-
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
<param-value>#{skin.standardSkinning}</param-value>
</context-param>
- <!--
- -->
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
-
-
-
-
-
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <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>/faces/*</url-pattern>
- </servlet-mapping>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <!--
+ -->
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <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>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.xhtml</url-pattern>
</servlet-mapping>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
-
-
-
+ <!--
+ login-config> <auth-method>BASIC</auth-method> </login-config
+ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Site</web-resource-name>
+ <url-pattern>/admin/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <!-- Roles that have access -->
+ <role-name>admin</role-name>
+ <role-name>user</role-name>
+
+
+ </auth-constraint>
+ </security-constraint>
+ <!-- BASIC authentication -->
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Basic Authentication</realm-name>
+ </login-config>
+ <!-- Define security roles -->
+ <security-role>
+ <description>admin</description>
+ <role-name>admin</role-name>
+ </security-role>
+ <security-role>
+ <description>user</description>
+ <role-name>user</role-name>
+ </security-role>
</web-app>