richfaces-svn-commits
March 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 552 discussions
JBoss Rich Faces SVN: r12965 - trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-16 11:51:05 -0400 (Mon, 16 Mar 2009)
New Revision: 12965
Modified:
trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css
Log:
https://jira.jboss.org/jira/browse/RF-6419
Richfaces Docs Application
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css 2009-03-16 15:50:45 UTC (rev 12964)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css 2009-03-16 15:51:05 UTC (rev 12965)
@@ -1,5 +1,5 @@
body {
- font-size: 12px;
+ font-size: 12px;
}
a:active, a:link, a:visited {
@@ -55,12 +55,16 @@
margin: 0px;
font-family: Arial,sans-serif;
color: #616161;
+
}
.body {
padding: 30px;
+ display:block; float:left;
+ width:75%;
+
}
-
+a {display:block}
.columnHeader:hover
{
color: #FF6600;
@@ -106,7 +110,9 @@
.errors textarea {
border: 1px solid red;
}
+.clear{
+}
.required {
color: red;
padding-left: 2px;
@@ -114,4 +120,12 @@
.rich-stglpanel-body {
overflow: auto;
-}
+}
+
+.richcomponentsmenu {
+display: block;
+float:left; width: 200px;
+height: 600px;
+padding-top: 30px;
+
+}
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12964 - trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-16 11:50:45 -0400 (Mon, 16 Mar 2009)
New Revision: 12964
Modified:
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6419
Richfaces Docs Application
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml 2009-03-16 15:08:42 UTC (rev 12963)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml 2009-03-16 15:50:45 UTC (rev 12964)
@@ -13,7 +13,9 @@
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
+<select size="1" > <option value="Cheese"> Cheese </option> ... </select>
- <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
- </rich:toolBarGroup>
+ </rich:toolBarGroup>
</rich:toolBar>
+
+
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml 2009-03-16 15:08:42 UTC (rev 12963)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml 2009-03-16 15:50:45 UTC (rev 12964)
@@ -4,7 +4,8 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>RichFaces Docs</title>
@@ -16,12 +17,34 @@
<ui:include src="menu.xhtml">
<ui:param name="projectName" value="RichFaces Docs"/>
</ui:include>
+ <div class="richcomponentsmenu">
+
+<rich:panelMenu
+ iconExpandedGroup="disc"
+ iconCollapsedGroup="disc"
+ iconExpandedTopGroup="chevronUp"
+ iconGroupTopPosition="right"
+ iconCollapsedTopGroup="chevronDown"
+ iconCollapsedTopPosition="right">
+<rich:panelMenuGroup label="RichFaces Components">
+<rich:panelMenuItem>
+<h:outputLink value="colorPicker.seam">color picker</h:outputLink>
+</rich:panelMenuItem>
+<rich:panelMenuItem>
+<h:outputLink value="demo.seam">demo</h:outputLink>
+</rich:panelMenuItem>
- <div class="body">
+</rich:panelMenuGroup>
+</rich:panelMenu>
+</div>
+
+ <div class="body" >
<ui:insert name="body"/>
+
+
</div>
- <div class="footer">
+ <div class="footer" style="display: block; float: none; clear:both;">
Powered by <a href="http://jboss.com/products/seam">Seam</a>.
Generated by seam-gen.
</div>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12963 - in management: planning and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-16 11:08:42 -0400 (Mon, 16 Mar 2009)
New Revision: 12963
Added:
management/planning/
management/planning/RF 3.3.1 RW Demo.pod
management/planning/RF 3.3.1.pod
Log:
Project plan updated
Added: management/planning/RF 3.3.1 RW Demo.pod
===================================================================
(Binary files differ)
Property changes on: management/planning/RF 3.3.1 RW Demo.pod
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/planning/RF 3.3.1.pod
===================================================================
(Binary files differ)
Property changes on: management/planning/RF 3.3.1.pod
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12962 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-16 11:02:36 -0400 (Mon, 16 Mar 2009)
New Revision: 12962
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml
Log:
Realworld: correct pages
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12961 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-16 10:08:17 -0400 (Mon, 16 Mar 2009)
New Revision: 12961
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
Log:
Realworld: correct pages
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12960 - in trunk/samples/colorPickerDemo: src/main/webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-03-16 08:21:06 -0400 (Mon, 16 Mar 2009)
New Revision: 12960
Modified:
trunk/samples/colorPickerDemo/pom.xml
trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp
Log:
RF-6496 - demo fixing
Modified: trunk/samples/colorPickerDemo/pom.xml
===================================================================
--- trunk/samples/colorPickerDemo/pom.xml 2009-03-16 11:30:36 UTC (rev 12959)
+++ trunk/samples/colorPickerDemo/pom.xml 2009-03-16 12:21:06 UTC (rev 12960)
@@ -38,5 +38,10 @@
<artifactId>richfaces-impl</artifactId>
<version>3.3.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>colorPicker</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-16 11:30:36 UTC (rev 12959)
+++ trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-16 12:21:06 UTC (rev 12960)
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/colorPicker" prefix="colorPicker"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/colorPicker" prefix="colorPicker"%>
<html>
<head>
<title>ColorPicker sample page</title>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12959 - in trunk/test-applications: richfaces-docs and 27 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-16 07:30:36 -0400 (Mon, 16 Mar 2009)
New Revision: 12959
Added:
trunk/test-applications/richfaces-docs/
trunk/test-applications/richfaces-docs/ear/
trunk/test-applications/richfaces-docs/ear/pom.xml
trunk/test-applications/richfaces-docs/ear/src/
trunk/test-applications/richfaces-docs/ear/src/main/
trunk/test-applications/richfaces-docs/ear/src/main/application/
trunk/test-applications/richfaces-docs/ear/src/main/application/security.drl
trunk/test-applications/richfaces-docs/ejb/
trunk/test-applications/richfaces-docs/ejb/pom.xml
trunk/test-applications/richfaces-docs/ejb/src/
trunk/test-applications/richfaces-docs/ejb/src/main/
trunk/test-applications/richfaces-docs/ejb/src/main/java/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/Person.java
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Authenticator.java
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Manager.java
trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/ManagerAction.java
trunk/test-applications/richfaces-docs/ejb/src/main/resources/
trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/
trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/ejb-jar.xml
trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/persistence.xml
trunk/test-applications/richfaces-docs/ejb/src/main/resources/components.properties
trunk/test-applications/richfaces-docs/ejb/src/main/resources/helloworld-ds.xml
trunk/test-applications/richfaces-docs/ejb/src/main/resources/import.sql
trunk/test-applications/richfaces-docs/ejb/src/main/resources/seam.properties
trunk/test-applications/richfaces-docs/pom.xml
trunk/test-applications/richfaces-docs/web/
trunk/test-applications/richfaces-docs/web/pom.xml
trunk/test-applications/richfaces-docs/web/src/
trunk/test-applications/richfaces-docs/web/src/main/
trunk/test-applications/richfaces-docs/web/src/main/java/
trunk/test-applications/richfaces-docs/web/src/main/java/org/
trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/
trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/ColorPicker.java
trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/Editor.java
trunk/test-applications/richfaces-docs/web/src/main/resources/
trunk/test-applications/richfaces-docs/web/src/main/resources/messages_en.properties
trunk/test-applications/richfaces-docs/web/src/main/webapp/
trunk/test-applications/richfaces-docs/web/src/main/webapp/META-INF/
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
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/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/lib/
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/pages.xml
trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/datatable.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/error.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/img/
trunk/test-applications/richfaces-docs/web/src/main/webapp/img/Thumbs.db
trunk/test-applications/richfaces-docs/web/src/main/webapp/img/dtpick.gif
trunk/test-applications/richfaces-docs/web/src/main/webapp/img/error.gif
trunk/test-applications/richfaces-docs/web/src/main/webapp/index.html
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/display.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/edit.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/
trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css
Log:
https://jira.jboss.org/jira/browse/RF-6419
Richfaces Docs Application
Added: trunk/test-applications/richfaces-docs/ear/pom.xml
===================================================================
--- trunk/test-applications/richfaces-docs/ear/pom.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/ear/pom.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>richfaces-docs</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>${projectName}-ear</artifactId>
+ <name>EAR module</name>
+ <packaging>ear</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>${projectName}-web</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>${richfacesVersion}</version>
+ </dependency>
+
+ <!-- EJB -->
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seamVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-pdf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>${projectName}-ejb</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>${projectName}-ear-1.0-SNAPSHOT</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <generateApplicationXml>true</generateApplicationXml>
+ <includeJar>false</includeJar>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <loader-repository>seam.jboss.org:loader=${project.build.finalName}</loader-repository>
+ <modules>
+ <webModule>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>${projectName}-web</artifactId>
+ <contextRoot>/${projectName}</contextRoot>
+ </webModule>
+ <ejbModule>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>${projectName}-ejb</artifactId>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Added: trunk/test-applications/richfaces-docs/ear/src/main/application/security.drl
===================================================================
--- trunk/test-applications/richfaces-docs/ear/src/main/application/security.drl (rev 0)
+++ trunk/test-applications/richfaces-docs/ear/src/main/application/security.drl 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,6 @@
+package Permissions;
+
+import java.security.Principal;
+
+import org.jboss.seam.security.PermissionCheck;
+import org.jboss.seam.security.Role;
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/ear/src/main/application/security.drl
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/pom.xml
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/pom.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/pom.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>richfaces-docs</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>${projectName}-ejb</artifactId>
+ <name>EJB module</name>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>ejb</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-remoting</artifactId>
+ <version>${seamVersion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javassist</artifactId>
+ <groupId>jboss</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seamVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>${seamVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-pdf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>${faceletsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>${richfacesVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>${richfacesVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ <version>${droolsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <version>${droolsVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/Person.java
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/Person.java (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/Person.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,38 @@
+package org.richfaces.helloworld.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.jboss.seam.annotations.Name;
+
+@Entity
+@Name("person")
+public class Person implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private long id;
+ private String name;
+
+ @Id
+ @GeneratedValue
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/domain/Person.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Authenticator.java
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Authenticator.java (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Authenticator.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,26 @@
+package org.richfaces.helloworld.service;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.security.Identity;
+
+
+@Name("authenticator")
+public class Authenticator
+{
+ @Logger Log log;
+
+ @In Identity identity;
+
+ public boolean authenticate()
+ {
+ log.info("authenticating #0", identity.getUsername());
+ //write your authentication logic here,
+ //return true if the authentication was
+ //successful, false otherwise
+ identity.addRole("admin");
+ return true;
+ }
+}
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Authenticator.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Manager.java
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Manager.java (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Manager.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,8 @@
+package org.richfaces.helloworld.service;
+
+import javax.ejb.Local;
+
+@Local
+public interface Manager {
+ public String sayHello();
+}
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/Manager.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/ManagerAction.java
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/ManagerAction.java (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/ManagerAction.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,30 @@
+package org.richfaces.helloworld.service;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.richfaces.helloworld.domain.Person;
+
+@Stateless
+@Name("manager")
+public class ManagerAction implements Manager {
+ @In @Out
+ private Person person;
+ @Out
+ private List<Person> fans;
+ @PersistenceContext
+ private EntityManager em;
+
+ public String sayHello() {
+ em.persist(person);
+ person = new Person();
+ fans = em.createQuery("select p from Person p").getResultList();
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/java/org/richfaces/helloworld/service/ManagerAction.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/ejb-jar.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/ejb-jar.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar 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/ejb-jar_3_0.xsd"
+ version="3.0">
+
+ <interceptors>
+ <interceptor>
+ <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+ </interceptor>
+ </interceptors>
+
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class>
+ </interceptor-binding>
+ </assembly-descriptor>
+
+</ejb-jar>
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/persistence.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/persistence.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Persistence deployment descriptor for dev profile -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+
+ <persistence-unit name="helloworld">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/helloworldDatasource</jta-data-source>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.show_sql" value="true"/>
+ <property name="hibernate.format_sql" value="true"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/helloworldEntityManagerFactory"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/META-INF/persistence.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/components.properties
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/resources/components.properties (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/resources/components.properties 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,4 @@
+#
+#Mon Sep 15 14:29:32 EEST 2008
+jndiPattern=${deployName}-ear-1.0-SNAPSHOT/#{ejbName}/local
+embeddedEjb=false
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/components.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/helloworld-ds.xml
===================================================================
--- trunk/test-applications/richfaces-docs/ejb/src/main/resources/helloworld-ds.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/ejb/src/main/resources/helloworld-ds.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>helloworldDatasource</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+<!--
+ <exception-sorter-class-name>
+ org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+ </exception-sorter-class-name>
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+-->
+ </local-tx-datasource>
+
+</datasources>
+
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/helloworld-ds.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/import.sql
===================================================================
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/import.sql
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/ejb/src/main/resources/seam.properties
===================================================================
Property changes on: trunk/test-applications/richfaces-docs/ejb/src/main/resources/seam.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/pom.xml
===================================================================
--- trunk/test-applications/richfaces-docs/pom.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/pom.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,94 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>richfaces-docs</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>richfaces-docs</name>
+ <properties>
+ <projectName>richfaces-docs</projectName>
+ <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion>
+ <seamVersion>2.0.1.GA</seamVersion>
+
+ <droolsVersion>4.0.0</droolsVersion>
+ <faceletsVersion>1.1.14</faceletsVersion>
+
+ </properties>
+ <repositories>
+
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>Snapshot Jboss Repository for Maven</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ </repository>
+
+<repository>
+ <id>repository.jboss.com</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
+
+
+
+
+
+ <repository>
+ <id>repository.exadel.com</id>
+ <name>Exadel Maven 2 Repository</name>
+ <url>http://repository.exadel.com/</url>
+ </repository>
+
+
+ </repositories>
+
+ <modules>
+ <module>ear</module>
+ <module>ejb</module>
+ <module>web</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JDK_CONTAINER</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Property changes on: trunk/test-applications/richfaces-docs/pom.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/pom.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/pom.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/pom.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>richfaces-docs</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>${projectName}-web</artifactId>
+ <name>WAR module</name>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/ColorPicker.java
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/ColorPicker.java (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/ColorPicker.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,45 @@
+package org.docs;
+
+public class ColorPicker {
+
+ String value;
+
+ String showEvent;
+
+ String colorMode;
+
+ String flat;
+
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+ public String getShowEvent() {
+ return showEvent;
+ }
+ public void setShowEvent(String showEvent) {
+ this.showEvent = showEvent;
+ }
+ public String getColorMode() {
+ return colorMode;
+ }
+ public void setColorMode(String colorMode) {
+ this.colorMode = colorMode;
+ }
+ public String getFlat() {
+ return flat;
+ }
+ public void setFlat(String flat) {
+ this.flat = flat;
+ }
+
+
+
+
+
+
+
+
+}
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/ColorPicker.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/Editor.java
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/Editor.java (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/Editor.java 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,18 @@
+package org.docs;
+
+public class Editor {
+
+ String edit;
+
+ public String getEdit() {
+ return edit;
+ }
+
+ public void setEdit(String edit) {
+ this.edit = edit;
+ }
+
+
+
+
+}
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/java/org/docs/Editor.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/resources/messages_en.properties (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/resources/messages_en.properties 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,90 @@
+up=\u2191
+down=\u2193
+left=\u2039
+right=\u203A
+
+validator.assertFalse=validation failed
+validator.assertTrue=validation failed
+validator.future=must be a future date
+validator.length=length must be between {min} and {max}
+validator.max=must be less than or equal to {value}
+validator.min=must be greater than or equal to {value}
+validator.notNull=may not be null
+validator.past=must be a past date
+validator.pattern=must match "{regex}"
+validator.range=must be between {min} and {max}
+validator.size=size must be between {min} and {max}
+validator.email=must be a well-formed email address
+
+org.jboss.seam.loginFailed=Login failed
+org.jboss.seam.loginSuccessful=Welcome, #0
+
+org.jboss.seam.TransactionFailed=Transaction failed
+org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request
+org.jboss.seam.IllegalNavigation=Illegal navigation
+org.jboss.seam.ProcessEnded=Process #0 already ended
+org.jboss.seam.ProcessNotFound=Process #0 not found
+org.jboss.seam.TaskEnded=Task #0 already ended
+org.jboss.seam.TaskNotFound=Task #0 not found
+org.jboss.seam.NotLoggedIn=Please log in first
+
+javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type
+javax.faces.component.UIInput.REQUIRED=value is required
+javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information
+javax.faces.component.UISelectOne.INVALID=value is not valid
+javax.faces.component.UISelectMany.INVALID=value is not valid
+
+javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number
+javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1}
+javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be an integer
+javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits
+javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false
+javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false)
+javax.faces.converter.ByteConverter.BYTE=value must be a number between 0 and 255
+javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255
+javax.faces.converter.CharacterConverter.CHARACTER=value must be a character
+javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character
+javax.faces.converter.DateTimeConverter.DATE=value must be a date
+javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1}
+javax.faces.converter.DateTimeConverter.TIME=value must be a time
+javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1}
+javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time
+javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1}
+javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value
+javax.faces.converter.DoubleConverter.DOUBLE=value must be a number
+javax.faces.converter.DoubleConverter.DOUBLE_detail=value must be a number between 4.9E-324 and 1.7976931348623157E308
+javax.faces.converter.EnumConverter.ENUM=value must be convertible to an enum
+javax.faces.converter.EnumConverter.ENUM_detail=value must be convertible to an enum or from the enum that contains the constant {1}
+javax.faces.converter.EnumConverter.ENUM_NO_CLASS=value must be convertible to an enum or from the enum, but no enum class provided
+javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided
+javax.faces.converter.FloatConverter.FLOAT=value must be a number
+javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38
+javax.faces.converter.IntegerConverter.INTEGER=value must be an integer
+javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647
+javax.faces.converter.LongConverter.LONG=value must be an integer
+javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807
+javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount
+javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1}
+javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount
+javax.faces.converter.NumberConverter.PERCENT_detail=value must be a percentage amount, eg. {1}
+javax.faces.converter.NumberConverter.NUMBER=value must be a number
+javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number
+javax.faces.converter.NumberConverter.PATTERN=value must be a number
+javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number
+javax.faces.converter.ShortConverter.SHORT=value must be an integer
+javax.faces.converter.ShortConverter.SHORT_detail=value must be an integer number between -32768 and 32767
+
+javax.faces.validator.DoubleRangeValidator.MAXIMUM=value must be less than or equal to {0}
+javax.faces.validator.DoubleRangeValidator.MINIMUM=value must be greater than or equal to {0}
+javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=value must be between {0} and {1}
+javax.faces.validator.DoubleRangeValidator.TYPE=value is not of the correct type
+javax.faces.validator.LengthValidator.MAXIMUM=value is must be shorter than or equal to {0} characters
+javax.faces.validator.LengthValidator.MINIMUM=value is must be longer than or equal to {0} characters
+javax.faces.validator.LongRangeValidator.MAXIMUM=value must be less than or equal to {0}
+javax.faces.validator.LongRangeValidator.MINIMUM=value must be greater than or equal to {0}
+javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=value must be between {0} and {1}
+javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type
+
+javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
+javax.faces.converter.STRING=value could not be converted to a string
+
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/resources/messages_en.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,59 @@
+<?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>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/.pages.xml.spdia
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:persistence="http://jboss.com/products/seam/persistence"
+ xmlns:drools="http://jboss.com/products/seam/drools"
+ xmlns:bpm="http://jboss.com/products/seam/bpm"
+ xmlns:security="http://jboss.com/products/seam/security"
+ 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/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
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+
+ <core:init debug="true" jndi-pattern="@jndiPattern@"/>
+
+ <core:manager concurrent-request-timeout="500"
+ 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"/>
+
+ <event type="org.jboss.seam.security.notLoggedIn">
+ <action execute="#{redirect.captureCurrentView}"/>
+ </event>
+ <event type="org.jboss.seam.security.loginSuccessful">
+ <action execute="#{redirect.returnToCapturedView}"/>
+ </event>
+
+</components>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/components.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ 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">
+ <managed-bean>
+ <managed-bean-name>editor</managed-bean-name>
+ <managed-bean-class>org.docs.Editor</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>edit</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>colorPicker</managed-bean-name>
+ <managed-bean-class>org.docs.ColorPicker</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>colorMode</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>flat</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>showEvent</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ <managed-property>
+ <property-name>value</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <locale-config>
+ <default-locale>en</default-locale>
+ <supported-locale>bg</supported-locale>
+ <supported-locale>de</supported-locale>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>tr</supported-locale>
+ </locale-config>
+ </application>
+</faces-config>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/pages.xml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/pages.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pages xmlns="http://jboss.com/products/seam/pages"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+
+ no-conversation-view-id="/home.xhtml">
+
+ <page view-id="*">
+ <navigation>
+ <rule if-outcome="home">
+ <redirect view-id="/home.xhtml"/>
+ </rule>
+ </navigation>
+ </page>
+
+ <exception class="org.jboss.seam.framework.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message>Not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.EntityNotFoundException">
+ <redirect view-id="/error.xhtml">
+ <message>Not found</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.persistence.OptimisticLockException">
+ <end-conversation/>
+ <redirect view-id="/error.xhtml">
+ <message>Another user changed the same data, please try again</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.AuthorizationException">
+ <redirect view-id="/error.xhtml">
+ <message>You don't have permission to do this</message>
+ </redirect>
+ </exception>
+
+ <exception class="org.jboss.seam.security.NotLoggedInException">
+ <redirect view-id="/login.xhtml">
+ <message>Please log in first</message>
+ </redirect>
+ </exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/error.xhtml">
+ <message>Your session has timed out, please try again</message>
+ </redirect>
+ </exception>
+
+ <exception>
+ <redirect view-id="/error.xhtml">
+ <message>Unexpected error, please try again</message>
+ </redirect>
+ </exception>
+
+</pages>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/pages.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,86 @@
+<?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"
+ version="2.5">
+
+ <!-- Ajax4jsf -->
+ <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>
+ <url-pattern>*.seam</url-pattern>
+ </filter-mapping>
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>blueSky</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>
+ </filter>
+
+ <filter-mapping>
+ <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>
+ </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>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint/>
+ </security-constraint>
+
+
+
+</web-app>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,29 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">The rich:colorPicker component</f:facet>
+
+ <h:form>
+ <rich:colorPicker value="#{colorPicker.value}" colorMode="hex" />
+ <h:commandButton value="Submit" />
+
+ </h:form>
+ <h:outputText value="#{colorPicker.value}" />
+
+ </rich:panel>
+
+
+</ui:define>
+</ui:composition>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/datatable.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/datatable.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/datatable.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,27 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich" template="layout/template.xhtml">
+
+ <ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message" />
+ <h:form>
+ Please enter your name:<br />
+ <h:inputText value="#{person.name}" size="15" />
+ <br />
+ <h:commandButton type="submit" value="Say Hello"
+ action="#{manager.sayHello}" />
+ </h:form>
+ <h:dataTable value="#{fans}" var="fan">
+ <h:column>
+ <h:outputText value="#{fan.name}" />
+ </h:column>
+ </h:dataTable>
+
+ </ui:define>
+</ui:composition>
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/datatable.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/error.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/error.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/error.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,18 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h1>Error</h1>
+ <p>Something bad happened :-(</p>
+
+ <h:messages styleClass="message"/>
+
+</ui:define>
+</ui:composition>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/error.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,39 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">Welcome!</f:facet>
+ <p>This empty shell application includes:</p>
+ <ul>
+
+ <li>Ant build script</li>
+ <li>Deployment to JBoss AS (EAR or WAR)</li>
+ <li>Development and production profiles</li>
+ <li>Integration testing using TestNG and Embedded JBoss</li>
+ <li>JavaBean or EJB 3.0 Seam components</li>
+ <li>JPA entity classes</li>
+ <li>A configurable DataSource and JPA EntityManager</li>
+ <li>Templated Facelets views</li>
+ <li>RichFaces panels and tables</li>
+ <li>Default CSS stylesheet</li>
+ <li>Internationalization support</li>
+
+ </ul>
+ <rich:colorPicker value="" />
+
+
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/Thumbs.db
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/dtpick.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/dtpick.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/error.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/img/error.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/index.html
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/index.html (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/index.html 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,5 @@
+<html>
+<head>
+ <meta http-equiv="Refresh" content="0; URL=home.seam">
+</head>
+</html>
\ No newline at end of file
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/index.html
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/display.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/display.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/display.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,16 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+
+ <div class="prop">
+ <span class="name">
+ <ui:insert name="label"/>
+ </span>
+ <span class="value">
+ <ui:insert/>
+ </span>
+ </div>
+
+</ui:composition>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/display.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/edit.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/edit.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/edit.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,27 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+
+ <div class="prop">
+
+ <s:label styleClass="name #{invalid?'errors':''}">
+ <ui:insert name="label"/>
+ <s:span styleClass="required" rendered="#{required}">*</s:span>
+ </s:label>
+
+ <span class="value #{invalid?'errors':''}">
+ <s:validateAll>
+ <ui:insert/>
+ </s:validateAll>
+ </span>
+
+ <span class="error">
+ <h:graphicImage value="/img/error.gif" rendered="#{invalid}" styleClass="errors"/>
+ <s:message styleClass="errors"/>
+ </span>
+
+ </div>
+
+</ui:composition>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/edit.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,19 @@
+<rich:toolBar
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:rich="http://richfaces.org/rich">
+ <rich:toolBarGroup>
+ <h:outputText value="#{projectName}:"/>
+ <s:link view="/home.xhtml" value="Home"/>
+
+ </rich:toolBarGroup>
+ <!-- @newMenuItem@ -->
+ <rich:toolBarGroup location="right">
+
+
+ <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ </rich:toolBarGroup>
+</rich:toolBar>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/menu.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>RichFaces Docs</title>
+ <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+ <ui:include src="menu.xhtml">
+ <ui:param name="projectName" value="RichFaces Docs"/>
+ </ui:include>
+
+ <div class="body">
+ <ui:insert name="body"/>
+ </div>
+
+ <div class="footer">
+ Powered by <a href="http://jboss.com/products/seam">Seam</a>.
+ Generated by seam-gen.
+ </div>
+
+</body>
+</html>
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout/template.xhtml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css (rev 0)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css 2009-03-16 11:30:36 UTC (rev 12959)
@@ -0,0 +1,117 @@
+body {
+ font-size: 12px;
+}
+
+a:active, a:link, a:visited {
+ color: #0D5798;
+}
+a:hover {
+ color: #8CAFCD;
+}
+
+input, textarea {
+ border: 1px solid #BBBBBB;
+ font-size: 10px;
+ background: #F0F8FF;
+ color: black;
+}
+
+input[type='submit'], input[type='button'] {
+ background: #4477AA;
+ color: white;
+ margin: 5px;
+ border-color: gray;
+}
+
+.tableControl, .actionButtons {
+ width: 100%;
+}
+
+.tableControl a {
+ padding-left: 10px;
+}
+
+.tableControl {
+ text-align: right;
+}
+
+.footer {
+ text-align: center;
+ font-size: 10px;
+}
+
+.rich-table {
+ width:100%;
+}
+
+h1 {
+ font-family: Arial,sans-serif;
+ color: #578BB8;
+ font-size: 1.6em;
+ margin-top: 0;
+}
+
+body {
+ margin: 0px;
+ font-family: Arial,sans-serif;
+ color: #616161;
+}
+
+.body {
+ padding: 30px;
+}
+
+.columnHeader:hover
+{
+ color: #FF6600;
+}
+
+.message {
+ border: 1px solid #FFCC00;
+ padding: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ background-color: #F0F8FF;
+ font-size: 12px;
+}
+
+.name {
+ vertical-align: top;
+ font-weight: bold;
+ width: 115px;
+ float: left;
+ padding: 5px;
+ margin-top: 3px;
+ clear: left;
+}
+.value {
+ float: left;
+ padding: 5px;
+}
+
+.error {
+ float: left;
+ padding: 5px;
+}
+.errors {
+ color: red;
+ vertical-align: middle;
+}
+img.errors {
+ padding-right: 5px;
+}
+.errors input {
+ border: 1px solid red;
+}
+.errors textarea {
+ border: 1px solid red;
+}
+
+.required {
+ color: red;
+ padding-left: 2px;
+}
+
+.rich-stglpanel-body {
+ overflow: auto;
+}
Property changes on: trunk/test-applications/richfaces-docs/web/src/main/webapp/stylesheet/theme.css
___________________________________________________________________
Name: svn:executable
+ *
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12958 - in trunk/test-applications/realworld2: web/src/main/java/org/richfaces/realworld and 16 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-13 15:23:09 -0400 (Fri, 13 Mar 2009)
New Revision: 12958
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FlushStrategy.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/fileupload/
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyFile.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/realworld2/web/src/main/webapp/img/Thumbs.db
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imagePreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/register/regInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -35,27 +35,32 @@
@In(value="entityManager")
EntityManager em;
-
@In @Out
private User user;
- public void addAlbum(Album album) {
+ public void addAlbum(Album album, boolean isFlushNeeded) {
em.persist(album);
user.addAlbum(album);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void deleteAlbum(Album album){
+ public void deleteAlbum(Album album, boolean isFlushNeeded){
if(album.getShelf()!=null){
album.getShelf().removeChildAlbum(album);
}else{
user.removeAlbum(album);
}
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void editAlbum(Album album){
- em.flush();
+ public void editAlbum(Album album, boolean isFlushNeeded){
+ if(isFlushNeeded){
+ em.flush();
+ }
}
public void flush(){
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -27,11 +27,11 @@
@Local
public interface IAlbumAction {
- public abstract void addAlbum(Album album);
+ public abstract void addAlbum(Album album, boolean isFlushNeeded);
- public void deleteAlbum(Album album);
+ public void deleteAlbum(Album album, boolean isFlushNeeded);
- public void editAlbum(Album album);
+ public void editAlbum(Album album, boolean isFlushNeeded);
public abstract void flush();
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -29,15 +29,15 @@
@Local
public interface IImageAction {
- public abstract void deleteImage(Image image);
+ public abstract void deleteImage(Image image, boolean isFlushNeeded);
- public abstract void editImage(Image image);
+ public abstract void editImage(Image image, boolean isFlushNeeded);
- public abstract void addImage(Image image);
+ public abstract void addImage(Image image, boolean isFlushNeeded);
- public void deleteComment(Comment comment);
+ public void deleteComment(Comment comment, boolean isFlushNeeded);
- public void addComment(Comment comment);
+ public void addComment(Comment comment, boolean isFlushNeeded);
public abstract MetaTag getTagByName(String tag);
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -11,11 +11,11 @@
@Local
public interface IShelfAction {
- public abstract void addShelf(Shelf shelf);
+ public abstract void addShelf(Shelf shelf, boolean isFlushNeeded);
- public void deleteShelf(Shelf shelf);
+ public void deleteShelf(Shelf shelf, boolean isFlushNeeded);
- public void editShelf(Shelf shelf);
+ public void editShelf(Shelf shelf, boolean isFlushNeeded);
public List<Shelf> getShelfs(User user);
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -27,10 +27,10 @@
@Local
public interface IUserAction {
public User login(String username, String password);
- public void register(User user);
+ public void register(User user, boolean isFlushNeeded);
public boolean isUserExist(String login);
- public void updateUser(User user);
- public void resetUser(User user);
+ public void updateUser(User user, boolean isFlushNeeded);
+ public void resetUser(User user, boolean isFlushNeeded);
public void loginAnonymous();
public Long countAlbums(User user);
public Long countImages(User user);
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -36,12 +36,14 @@
@In(value="entityManager")
EntityManager em;
- public void deleteImage(Image image){
+ public void deleteImage(Image image, boolean isFlushNeeded){
image.getAlbum().removeImage(image);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void editImage(Image image) {
+ public void editImage(Image image, boolean isFlushNeeded) {
/*image.setImageTags(null);
String[] tokens = image.getMeta().split(",");
for(String token:tokens){
@@ -56,10 +58,12 @@
image.addMetaTag(t);
}
}*/
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void addImage(Image image) {
+ public void addImage(Image image, boolean isFlushNeeded) {
String[] tokens = image.getMeta().split(",");
for(String token:tokens){
MetaTag t =(MetaTag) em.createQuery("from MetaTag t where t.tag =:token").setParameter("token", token).getSingleResult();
@@ -75,17 +79,23 @@
}
em.persist(image);
image.getAlbum().addImage(image);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void deleteComment(Comment comment){
+ public void deleteComment(Comment comment, boolean isFlushNeeded){
comment.getImage().removeComment(comment);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void addComment(Comment comment){
+ public void addComment(Comment comment, boolean isFlushNeeded){
comment.getImage().addComment(comment);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
public MetaTag getTagByName(String tag) {
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -43,19 +43,25 @@
@In @Out
private User user;
- public void addShelf(Shelf shelf) {
+ public void addShelf(Shelf shelf, boolean isFlushNeeded) {
em.persist(shelf);
user.addShelf(shelf);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void deleteShelf(Shelf shelf){
+ public void deleteShelf(Shelf shelf, boolean isFlushNeeded){
user.removeShelf(shelf);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void editShelf(Shelf shelf){
- em.flush();
+ public void editShelf(Shelf shelf, boolean isFlushNeeded){
+ if(isFlushNeeded){
+ em.flush();
+ }
}
public List<Shelf> getShelfs(User user) {
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -51,19 +51,25 @@
.getSingleResult();
}
- public void register(User user) {
+ public void register(User user, boolean isFlushNeeded) {
em.persist(user);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
}
- public void updateUser(User user) {
- em.flush();
+ public void updateUser(User user, boolean isFlushNeeded) {
+ if(isFlushNeeded){
+ em.flush();
+ }
this.user = user;
}
- public void resetUser(User user) {
+ public void resetUser(User user, boolean isFlushNeeded) {
em.refresh(user);
- em.flush();
+ if(isFlushNeeded){
+ em.flush();
+ }
this.user = user;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyFile.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyFile.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyFile.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -24,6 +24,9 @@
private static int override = OVERWRITE_ASK;
public static Long copyFile(File srcFile, File destFile) throws IOException {
+ if(!srcFile.getPath().toLowerCase().endsWith("jpg") && !srcFile.getPath().toLowerCase().endsWith("jpeg")){
+ return -1L;
+ }
InputStream in = new FileInputStream(srcFile);
OutputStream out = new FileOutputStream(destFile);
long millis = System.currentTimeMillis();
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -48,6 +48,13 @@
if (!uploadDestFolder.exists()) {
uploadDestFolder.mkdirs();
+ }else{
+ for (String f : uploadDestFolder.list()) {
+ File temp = new File(uploadDestFolder, f);
+ temp.delete();
+ }
+ uploadDestFolder.delete();
+ uploadDestFolder.mkdirs();
}
CopyFile.copyDirectory(uploadFolder, uploadDestFolder);
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -33,6 +33,7 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IAlbumAction;
+import org.richfaces.realworld.util.FlushStrategy;
@Name("albumManager")
@Scope(ScopeType.CONVERSATION)
@@ -41,7 +42,7 @@
private static final long serialVersionUID = 2631634926126857691L;
private String oncomplete = ";";
-
+ @In(create=true) FlushStrategy flushStrategy;
@In(create=true, required=true)
private IAlbumAction albumAction;
@@ -57,7 +58,7 @@
@In @Out Model model;
public void addAlbum(Album album){
- albumAction.addAlbum(album);
+ albumAction.addAlbum(album, flushStrategy.isDatabaseStoreStrategy());
addDirectory();
model.setSelectedImage(null);
model.setSelectedAlbum(album);
@@ -72,7 +73,7 @@
}
public void editAlbum(Album album){
- albumAction.editAlbum(album);
+ albumAction.editAlbum(album, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedAlbum(album);
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
Events.instance().raiseEvent("albumEdited");
@@ -81,7 +82,7 @@
public void deleteAlbum(Album album){
//Update domain model
String string = album.getId().toString();
- albumAction.deleteAlbum(album);
+ albumAction.deleteAlbum(album, flushStrategy.isDatabaseStoreStrategy());
deleteDirectory(string);
model.setSelectedImage(null);
model.setSelectedAlbum(null);
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -34,9 +34,10 @@
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
-import org.richfaces.realworld.fileupload.FileItem;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IAlbumAction;
+import org.richfaces.realworld.ui.FileItem;
+import org.richfaces.realworld.util.FlushStrategy;
@Name("dndManager")
public class DnDManager implements DropListener {
@@ -46,6 +47,7 @@
FileManager fileManager;
@In(create=true)
IAlbumAction albumAction;
+ @In(create=true) FlushStrategy flushStrategy;
public void processDrop(DropEvent dropEvent) {
Dropzone dropzone = (Dropzone) dropEvent.getComponent();
@@ -86,7 +88,9 @@
return;
}else{
dropValue.addAlbum(dragValue);
- albumAction.flush();
+ if(flushStrategy.isDatabaseStoreStrategy()){
+ albumAction.flush();
+ }
Events.instance().raiseEvent("clearTree");
}
}
@@ -100,14 +104,18 @@
String newPath = getNewPathOfImage(dragValue, dropValue);
dragValue.setPath(newPath);
dropValue.addImage(dragValue);
- albumAction.flush();
+ if(flushStrategy.isDatabaseStoreStrategy()){
+ albumAction.flush();
+ }
}
private void handleUploadedImage(FileItem dragValue, Album dropValue) {
String newPath = generateNewPath(dragValue.getName(), dropValue);
dragValue.getImage().setPath(newPath);
dropValue.addImage(dragValue.getImage());
- albumAction.flush();
+ if(flushStrategy.isDatabaseStoreStrategy()){
+ albumAction.flush();
+ }
fileManager.addImage(newPath, dragValue.getFile().getPath());
Events.instance().raiseEvent("fileAdded", dragValue);
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -10,9 +10,9 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
-import org.richfaces.realworld.fileupload.FileItem;
-import org.richfaces.realworld.fileupload.FileWrapper;
import org.richfaces.realworld.service.Constants;
+import org.richfaces.realworld.ui.FileItem;
+import org.richfaces.realworld.ui.FileWrapper;
@Name("fileUploadManager")
@Scope(ScopeType.CONVERSATION)
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -35,6 +35,7 @@
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IImageAction;
import org.richfaces.realworld.util.DirectLinkHelper;
+import org.richfaces.realworld.util.FlushStrategy;
@Name("imageManager")
@@ -43,7 +44,7 @@
@In(create=true, required=true)
private IImageAction imageAction;
-
+ @In FlushStrategy flushStrategy;
@In(create=true)
FileManager fileManager;
@@ -57,20 +58,20 @@
public void deleteImage(Image image){
String imagePath = image.getPath();
- imageAction.deleteImage(image);
+ imageAction.deleteImage(image, flushStrategy.isDatabaseStoreStrategy());
fileManager.deleteImage(imagePath);
Events.instance().raiseEvent("imageDeleted");
}
public void editImage(Image image){
- imageAction.editImage(image);
+ imageAction.editImage(image, flushStrategy.isDatabaseStoreStrategy());
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
Events.instance().raiseEvent("imageEdited");
}
@Observer(Constants.ADD_IMAGE_EVENT)
public void addImage(Image image) {
- imageAction.addImage(image);
+ imageAction.addImage(image, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedAlbum(image.getAlbum());
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW);
Events.instance().raiseEvent("imageAdded");
@@ -86,12 +87,12 @@
comment.setImage(image);
comment.setDate(new Date());
comment.setMessage(message);
- imageAction.addComment(comment);
+ imageAction.addComment(comment, flushStrategy.isDatabaseStoreStrategy());
Events.instance().raiseEvent(Constants.CLEAR_EDITOR_EVENT, "");
}
public void deleteComment(Comment comment){
- imageAction.deleteComment(comment);
+ imageAction.deleteComment(comment, flushStrategy.isDatabaseStoreStrategy());
}
public String getImageDirectLink(Image image) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -18,6 +18,7 @@
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
import org.richfaces.realworld.ui.PasswordHolder;
+import org.richfaces.realworld.util.FlushStrategy;
@Name("registerManager")
@Scope(ScopeType.CONVERSATION)
@@ -26,6 +27,8 @@
@In("#{messages['login_success']}")
private String LOGIN_SUCCESS;
+ @In FlushStrategy flushStrategy;
+
@In("#{messages['user.exist']}") private String USER_WITH_THIS_LOGIN_ALREADY_EXIST;
@In("#{messages['user.confirm.error']}") private String CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD;
@@ -49,7 +52,7 @@
return "";
}
user.setPasswordHash(passwordHolder.hash(user.getPassword()));
- userAction.register(user);
+ userAction.register(user, flushStrategy.isDatabaseStoreStrategy());
facesMessages.add(LOGIN_SUCCESS);
return "main";
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -36,6 +36,7 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IShelfAction;
+import org.richfaces.realworld.util.FlushStrategy;
@Name("shelfManager")
@Scope(ScopeType.CONVERSATION)
@@ -48,15 +49,14 @@
@In(create=true, required=true)
private IShelfAction shelfAction;
private String oncomplete = ";";
-
+ @In FlushStrategy flushStrategy;
@In @Out Model model;
@In
private User user;
public void addShelf(Shelf shelf){
- shelfAction.addShelf(shelf);
- //Update conversation state
+ shelfAction.addShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedImage(null);
model.setSelectedAlbum(null);
model.setSelectedShelf(shelf);
@@ -65,7 +65,7 @@
}
public void editShelf(Shelf shelf){
- shelfAction.editShelf(shelf);
+ shelfAction.editShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
model.setSelectedShelf(shelf);
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW);
}
@@ -76,7 +76,7 @@
for(Album a:shelf.getAlbums()){
directoriesToDelete.add(user.getLogin() + "/" +a.getId());
}
- shelfAction.deleteShelf(shelf);
+ shelfAction.deleteShelf(shelf, flushStrategy.isDatabaseStoreStrategy());
deleteDirectories(directoriesToDelete);
model.setSelectedImage(null);
model.setSelectedAlbum(null);
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -13,7 +13,7 @@
*/
public abstract class ISearchOption {
- private boolean selected;
+ private boolean selected = true;
private List<?> searchResult;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -48,6 +48,16 @@
options.add(new SearchOptionByTag());
}
+ public String getCriteriaString(){
+ StringBuilder s = new StringBuilder();
+ for(ISearchOption option:options) {
+ if(option.getSelected()){
+ s.append(option.getName() + ",");
+ }
+ }
+ return s.toString();
+ }
+
public void search() {
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SEARCH);
Iterator<ISearchOption> it = options.iterator();
Copied: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java (from rev 12922, trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/fileupload/FileItem.java)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -0,0 +1,82 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.realworld.ui;
+
+import java.io.File;
+
+import org.richfaces.realworld.domain.Image;
+
+public class FileItem {
+
+ private Image image = new Image();
+
+ private boolean selected;
+
+ private long length;
+
+ private byte[] data;
+
+ private File file;
+
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public byte[] getData() {
+ return data;
+ }
+ public void setData(byte[] data) {
+ this.data = data;
+ }
+
+ public long getLength() {
+ return length;
+ }
+ public void setLength(long length) {
+ this.length = length;
+ }
+
+ public boolean isSelected() {
+ return selected;
+ }
+
+ public void setSelected(boolean selected) {
+ this.selected = selected;
+ }
+
+ public Image getImage() {
+ return image;
+ }
+
+ public void setImage(Image image) {
+ this.image = image;
+ }
+ public File getFile() {
+ return file;
+ }
+ public void setFile(File file) {
+ this.file = file;
+ }
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -36,8 +36,6 @@
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
import org.richfaces.realworld.domain.Image;
-import org.richfaces.realworld.fileupload.FileItem;
-import org.richfaces.realworld.fileupload.FileWrapper;
import org.richfaces.realworld.manager.FileManager;
import org.richfaces.realworld.service.Constants;
Copied: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java (from rev 12917, trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.java)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -0,0 +1,51 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.realworld.ui;
+
+import java.util.ArrayList;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
+import org.jboss.seam.annotations.Scope;
+
+@Name("fileWrapper")
+(a)Scope(ScopeType.SESSION)
+public class FileWrapper {
+
+ private ArrayList<FileItem> files = new ArrayList<FileItem>();
+ public int getSize() {
+ return getFiles().size();
+ }
+
+ public ArrayList<FileItem> getFiles() {
+ return files;
+ }
+
+ public void setFiles(ArrayList<FileItem> files) {
+ this.files = files;
+ }
+
+ @Observer("fileAdded")
+ public void removeFile(FileItem file){
+ files.remove(file);
+ }
+}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -23,13 +23,14 @@
import org.richfaces.realworld.manager.Model;
import org.richfaces.realworld.service.Constants;
import org.richfaces.realworld.service.IUserAction;
+import org.richfaces.realworld.util.FlushStrategy;
/**
* @author Andrey Markavtsov
*
*/
@Name("userPrefsBean")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.SESSION)
public class UserPrefsHelper {
@In(create=true)
@@ -37,9 +38,9 @@
@In(create=true)
FileManager fileManager;
+ @In FlushStrategy flushStrategy;
+ @In(create=true) @Out Model model;
- @In @Out Model model;
-
@In
User user;
@@ -56,6 +57,7 @@
public void uploadAvatar(UploadEvent event) {
UploadItem item = event.getUploadItem();
avatarData = item.getFile();
+ user.setHasAvatar(true);
}
public void saveUser(User user){
@@ -71,7 +73,7 @@
avatarData = null;
user.setHasAvatar(true);
}
- userAction.updateUser(user);
+ userAction.updateUser(user, flushStrategy.isDatabaseStoreStrategy());
}
public void cancel() {
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FlushStrategy.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FlushStrategy.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FlushStrategy.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -0,0 +1,41 @@
+package org.richfaces.realworld.util;
+
+import javax.faces.context.FacesContext;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+@Name("flushStrategy")
+(a)Scope(ScopeType.APPLICATION)
+@AutoCreate
+public class FlushStrategy {
+
+ private String strategy;
+
+ public String getStrategy() {
+ if(strategy == null){
+ FacesContext fc = FacesContext.getCurrentInstance();
+ if (fc != null) {
+ String initParameter = fc.getExternalContext().getInitParameter(
+ "storeStrategy");
+ if(initParameter.equals("conversation") || initParameter.equals("database")){
+ strategy = initParameter;
+ }else{
+ throw new RuntimeException("Wrong storeStrategy context parameter. It should be 'conversation' or 'database'");
+ }
+
+ }
+ }
+ return strategy;
+ }
+
+ public void setStrategy(String strategy) {
+ this.strategy = strategy;
+ }
+
+ public boolean isDatabaseStoreStrategy(){
+ return getStrategy().equals("database");
+ }
+}
Property changes on: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FlushStrategy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Copied: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java (from rev 12922, trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2009-03-13 19:23:09 UTC (rev 12958)
@@ -0,0 +1,106 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.realworld.util;
+
+import java.awt.image.BufferedImage;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+
+import javax.imageio.ImageIO;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.core.Events;
+import org.richfaces.realworld.manager.FileManager;
+import org.richfaces.realworld.service.Constants;
+
+@Name("imageLoader")
+(a)Scope(ScopeType.CONVERSATION)
+public class ImageLoader implements Serializable{
+
+ private static final long serialVersionUID = -1572789608594870285L;
+
+ @In(create=true)
+ FileManager fileManager;
+ @In("#{messages['file_processing_error']}")
+ private String FILE_PROCESSING_ERROR;
+
+ public synchronized void paintImage(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ File imageResource = fileManager.getImage(data.toString());
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ return;
+ }
+ try {
+ BufferedImage images = ImageIO.read(paintData);
+ ImageIO.write(images, Constants.JPEG, out);
+ } catch (Exception e) {
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ return;
+ } finally {
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+
+ public synchronized void paintImageFromFile(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ File imageResource = fileManager.getImageFile(data.toString());
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ return;
+ }
+ try {
+ BufferedImage images = ImageIO.read(paintData);
+ ImageIO.write(images, Constants.JPEG, out);
+ } catch (Exception e) {
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ return;
+ } finally {
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-13 19:23:09 UTC (rev 12958)
@@ -81,9 +81,14 @@
<context-param>
<param-name>uploadRoot</param-name>
- <param-value>d:/Upload/</param-value>
+ <param-value>/srv/www/jboss-portal/server/default/data/Upload/</param-value>
</context-param>
+ <context-param>
+ <param-name>storeStrategy</param-name>
+ <param-value>database</param-value>
+ </context-param>
+
<context-param>
<param-name>facelets.LIBRARIES</param-name>
<param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/img/Thumbs.db
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imagePreview.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/register/regInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-13 19:23:09 UTC (rev 12958)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:repeat id="albumsList" value="#{result}" var="album" >
+ <a4j:repeat rendered="#{result.size() > 0}" id="albumsList" value="#{result}" var="album" >
<h:panelGroup layout="block" styleClass="preview_box_album_120">
<h:graphicImage styleClass="pr_album_bg" value="/img/shell/frame_album_200.png" />
<h:panelGrid cellpadding="0">
@@ -42,5 +42,6 @@
<a href="#">#{album.owner.firstName} #{album.owner.secondName}</a>
</h:panelGroup>
</h:panelGroup>
- </a4j:repeat>
+ </a4j:repeat>
+ <h:outputText rendered="#{result.size() == 0}" value="No results found" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-13 19:23:09 UTC (rev 12958)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:repeat value="#{result}" var="image">
+ <a4j:repeat rendered="#{result.size() > 0}" value="#{result}" var="image">
<h:panelGroup layout="block" styleClass="preview_box_photo_120">
<h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_200.png" />
<h:panelGrid cellpadding="0">
@@ -33,4 +33,5 @@
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
+ <h:outputText rendered="#{result.size() == 0}" value="No results found" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/tagsResult.xhtml 2009-03-13 19:23:09 UTC (rev 12958)
@@ -4,7 +4,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:repeat id="tagList" value="#{result}" var="tag">
+ <a4j:repeat rendered="#{result.size() > 0}" id="tagList" value="#{result}" var="tag">
<a4j:commandLink reRender="mainArea" actionListener="#{controller.showTag(tag)}" value="#{tag.tag}"></a4j:commandLink><br/>
</a4j:repeat>
+ <h:outputText rendered="#{result.size() == 0}" value="No results found" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-13 17:09:04 UTC (rev 12957)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-13 19:23:09 UTC (rev 12958)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:repeat id="userList" value="#{result}" var="user">
+ <a4j:repeat rendered="#{result.size() > 0}" id="userList" value="#{result}" var="user">
<h:panelGroup layout="block" styleClass="preview_box_photo_120">
<h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_200.png" style="border:none"/>
<h:panelGrid cellpadding="0">
@@ -32,4 +32,5 @@
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
+ <h:outputText rendered="#{result.size() == 0}" value="No results found" />
</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/index.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/register.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12957 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-13 13:09:04 -0400 (Fri, 13 Mar 2009)
New Revision: 12957
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java
Log:
Reviewing selenium tests
small fix
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2009-03-13 16:15:18 UTC (rev 12956)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2009-03-13 17:09:04 UTC (rev 12957)
@@ -460,7 +460,7 @@
clickById(ajax);
waitForAjaxCompletion();
AssertTextEquals(actionResultText, "item0");
- String selectedItems = getTextById(actionResultText);
+ String selectedItems = getTextById(selectionText);
if (!selectedItems.contains("item2")) {
Assert.fail("The third item was not selected");
}
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12956 - trunk/test-applications/realworld2/web/src/main/webapp/layout.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-13 12:15:18 -0400 (Fri, 13 Mar 2009)
New Revision: 12956
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
Log:
Fix error after enter button pressed on search input
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
15 years, 10 months
- 1
- 0