JBoss Rich Faces SVN: r2855 - in trunk/samples/richfaces-ear-demo: ejb/src/main/java and 12 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-09-10 19:04:22 -0400 (Mon, 10 Sep 2007)
New Revision: 2855
Added:
trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/
trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/MANIFEST.MF
trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/Guess.java
trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/GuessBean.java
trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/
trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/MANIFEST.MF
trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/
trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/
trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/
trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/GuessViewBean.java
trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/
trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/MANIFEST.MF
trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/
trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/guess.xhtml
Modified:
trunk/samples/richfaces-ear-demo/ejb/pom.xml
trunk/samples/richfaces-ear-demo/webapp/pom.xml
trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp
Log:
EAR demo started in the glassfish & jboss 4.2
Modified: trunk/samples/richfaces-ear-demo/ejb/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-10 22:44:20 UTC (rev 2854)
+++ trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-10 23:04:22 UTC (rev 2855)
@@ -2,58 +2,59 @@
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">
<parent>
- <artifactId>richfaces-ear-demo</artifactId>
- <groupId>org.richfaces.samples</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
- <artifactId>ejb</artifactId>
- <packaging>ejb</packaging>
- <name>ejb</name>
- <version>3.1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <!-- this is false by default -->
- <generateClient>true</generateClient>
- <ejbVersion>3.0</ejbVersion>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>richfaces-ear-demo</artifactId>
+ <groupId>org.richfaces.samples</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
+ <artifactId>ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>ejb</name>
+ <version>3.1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>ejb</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <!-- this is false by default -->
+ <generateClient>true</generateClient>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Added: trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/MANIFEST.MF 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/samples/richfaces-ear-demo/ejb/src/main/java/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/Guess.java
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/Guess.java (rev 0)
+++ trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/Guess.java 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,70 @@
+/**
+ *
+ */
+package org.richfaces.samples;
+
+import javax.ejb.Local;
+import javax.ejb.LocalHome;
+
+/**
+ * @author asmirnov
+ *
+ */
+@Local
+public interface Guess {
+
+ /**
+ * @return the min
+ */
+ public int getMin();
+
+ /**
+ * @param min the min to set
+ */
+ public void setMin(int min);
+
+ /**
+ * @return the max
+ */
+ public int getMax();
+
+ /**
+ * @param max the max to set
+ */
+ public void setMax(int max);
+
+ /**
+ * @return the attempts
+ */
+ public int getAttempts();
+
+ /**
+ * @param attempts the attempts to set
+ */
+ public void setAttempts(int attempts);
+
+ /**
+ * @return the maxAttempts
+ */
+ public int getMaxAttempts();
+
+ /**
+ * @param maxAttempts the maxAttempts to set
+ */
+ public void setMaxAttempts(int maxAttempts);
+
+ /**
+ * @return the userGuess
+ */
+ public int getUserGuess();
+
+ /**
+ * @param userGuess the userGuess to set
+ */
+ public void setUserGuess(int userGuess);
+
+ public void start();
+
+ public int guess();
+
+}
Property changes on: trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/Guess.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/GuessBean.java
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/GuessBean.java (rev 0)
+++ trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/GuessBean.java 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,138 @@
+/**
+ *
+ */
+package org.richfaces.samples;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+/**
+ * @author asmirnov
+ *
+ */
+@Stateful
+public class GuessBean implements Guess {
+
+ int random;
+
+ int min;
+
+ int max;
+
+ int attempts;
+
+ int maxAttempts;
+
+ int userGuess;
+
+ public GuessBean() {
+ }
+
+
+
+ @Remove
+ public void destroy(){
+
+ }
+
+ /**
+ * @return the random
+ */
+ public int getRandom() {
+ return random;
+ }
+
+ /**
+ * @param random the random to set
+ */
+ public void setRandom(int random) {
+ this.random = random;
+ }
+
+ /**
+ * @return the min
+ */
+ public int getMin() {
+ return min;
+ }
+
+ /**
+ * @param min the min to set
+ */
+ public void setMin(int min) {
+ this.min = min;
+ }
+
+ /**
+ * @return the max
+ */
+ public int getMax() {
+ return max;
+ }
+
+ /**
+ * @param max the max to set
+ */
+ public void setMax(int max) {
+ this.max = max;
+ }
+
+ /**
+ * @return the attempts
+ */
+ public int getAttempts() {
+ return attempts;
+ }
+
+ /**
+ * @param attempts the attempts to set
+ */
+ public void setAttempts(int attempts) {
+ this.attempts = attempts;
+ }
+
+
+
+ /**
+ * @return the maxAttempts
+ */
+ public int getMaxAttempts() {
+ return maxAttempts;
+ }
+
+
+
+ /**
+ * @param maxAttempts the maxAttempts to set
+ */
+ public void setMaxAttempts(int maxAttempts) {
+ this.maxAttempts = maxAttempts;
+ }
+
+
+
+ /**
+ * @return the userGuess
+ */
+ public int getUserGuess() {
+ return userGuess;
+ }
+
+
+
+ /**
+ * @param userGuess the userGuess to set
+ */
+ public void setUserGuess(int userGuess) {
+ this.userGuess = userGuess;
+ }
+
+ public void start(){
+
+ }
+
+ public int guess(){
+ return userGuess-random;
+ }
+
+}
Property changes on: trunk/samples/richfaces-ear-demo/ejb/src/main/java/org/richfaces/samples/GuessBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/MANIFEST.MF 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/samples/richfaces-ear-demo/richfacesEAR/src/main/application/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/richfaces-ear-demo/webapp/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-10 22:44:20 UTC (rev 2854)
+++ trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-10 23:04:22 UTC (rev 2855)
@@ -2,77 +2,84 @@
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">
<parent>
- <artifactId>richfaces-ear-demo</artifactId>
- <groupId>org.richfaces.samples</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
- <artifactId>webapp</artifactId>
- <packaging>war</packaging>
- <name>webapp Maven Webapp</name>
- <version>3.1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <finalName>webapp</finalName>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
- <artifactId>ejb</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <type>ejb-client</type>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <artifactId>richfaces-ear-demo</artifactId>
+ <groupId>org.richfaces.samples</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
+ <artifactId>webapp</artifactId>
+ <packaging>war</packaging>
+ <name>webapp Maven Webapp</name>
+ <version>3.1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <build>
+ <finalName>webapp</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-api</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
+ <artifactId>ejb</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <type>ejb-client</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Added: trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/GuessViewBean.java
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/GuessViewBean.java (rev 0)
+++ trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/GuessViewBean.java 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package org.richfaces.samples;
+
+import javax.ejb.EJB;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class GuessViewBean {
+
+ @EJB
+ private Guess guess;
+
+ /**
+ * @return the guess
+ */
+ public Guess getGuess() {
+ return guess;
+ }
+
+ /**
+ * @param guess the guess to set
+ */
+ public void setGuess(Guess guess) {
+ this.guess = guess;
+ }
+
+}
Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/java/org/richfaces/samples/GuessViewBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/MANIFEST.MF 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp 2007-09-10 22:44:20 UTC (rev 2854)
+++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/index.jsp 2007-09-10 23:04:22 UTC (rev 2855)
@@ -1,5 +1,11 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
<html>
-<body>
-<h2>Hello World!</h2>
-</body>
+
+<head></head>
+
+ <body>
+ <jsp:forward page="/faces/pages/guess.xhtml" />
+ </body>
+
</html>
Added: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/guess.xhtml
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/guess.xhtml (rev 0)
+++ trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/guess.xhtml 2007-09-10 23:04:22 UTC (rev 2855)
@@ -0,0 +1,24 @@
+<!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:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<head>
+<title>Guess number demo</title>
+</head>
+<body>
+<f:view>
+ <h:form id="form" >
+ <rich:panel>
+ <f:facet name="header" >
+ <h:outputText value="Guess number demo application"/>
+ </f:facet>
+ Hello, world !
+ </rich:panel>
+ </h:form>
+ <a4j:log hotkey="D" />
+</f:view>
+</body>
+</html>
Property changes on: trunk/samples/richfaces-ear-demo/webapp/src/main/webapp/pages/guess.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
18 years, 8 months
JBoss Rich Faces SVN: r2854 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: tree and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2007-09-10 18:44:20 -0400 (Mon, 10 Sep 2007)
New Revision: 2854
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml
Log:
demo update. demo simple example
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple.xhtml 2007-09-10 19:44:07 UTC (rev 2853)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple.xhtml 2007-09-10 22:44:20 UTC (rev 2854)
@@ -5,12 +5,26 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
+ <style>
+ .col, .col2 {
+ width:50%;
+ vertical-align:top;
+ }
+ </style>
+
+
<h:form>
- <rich:tree style="width:300px" nodeSelectListener="#{simpleTreeBean.processSelection}" reRender="selectedNode" ajaxSubmitSelection="true" toggleOnClick="true" switchType="client" value="#{simpleTreeBean.treeNode}" var="item">
- </rich:tree>
+ <h:panelGrid columns="2" width="100%" columnClasses="col1,col2">
+
+ <rich:tree style="width:300px" nodeSelectListener="#{simpleTreeBean.processSelection}"
+ reRender="selectedNode" ajaxSubmitSelection="true" switchType="client"
+ value="#{simpleTreeBean.treeNode}" var="item">
+ </rich:tree>
+
+ <h:outputText escape="false" value="Selected Node: #{simpleTreeBean.nodeTitle}" id="selectedNode" />
+
+ </h:panelGrid>
- <h:outputText value="#{simpleTreeBean.nodeTitle}" id="selectedNode" />
-
</h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml 2007-09-10 19:44:07 UTC (rev 2853)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml 2007-09-10 22:44:20 UTC (rev 2854)
@@ -7,11 +7,27 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
+
+ <p>RichFaces Tree has a default Data Model that allows to show a simple tree without creating
+ the set on your own tree model classes. The follwing demo shows how to create a tree based on the
+ data from the properties file.
+ </p>
+
<div class="sample-container" >
<ui:include src="/richfaces/tree/examples/simple.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/tree/examples/simple.xhtml"/>
+ <ui:param name="openlabel" value="Open Page Source" />
</ui:include>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/tree/examples/simple-tree-data.properties"/>
+ <ui:param name="openlabel" value="Open Data File" />
+ </ui:include>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/demo/tree/SimpleTreeBean.java"/>
+ <ui:param name="openlabel" value="View SimpleTreeBean.java Source" />
+ <ui:param name="sourcetype" value="java" />
+ </ui:include>
</div>
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2007-09-10 19:44:07 UTC (rev 2853)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2007-09-10 22:44:20 UTC (rev 2854)
@@ -13,7 +13,7 @@
<rich:tab label="Usage">
<ui:include src="/richfaces/tree/usage.xhtml"/>
</rich:tab>
- <rich:tab label=""Hello world!" tree">
+ <rich:tab label="Default Tree Model">
<ui:include src="/richfaces/tree/simple-tree.xhtml"/>
</rich:tab>
<ui:include src="/templates/include/tagInfo.xhtml">
18 years, 8 months
JBoss Rich Faces SVN: r2853 - trunk/ui/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-10 15:44:07 -0400 (Mon, 10 Sep 2007)
New Revision: 2853
Modified:
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
Fixed: modal panel ignored style attribute
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-09-10 19:44:03 UTC (rev 2852)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-09-10 19:44:07 UTC (rev 2853)
@@ -36,8 +36,8 @@
<div id="#{clientId}Container"
style="position: absolute; display: none; z-index: #{component.zindex}; background-color: inherit;"
- class="rich-modalpanel"
- x:passThruWithExclusions="id,style,class"
+ class="rich-modalpanel #{component.attributes['styleClass']}"
+ x:passThruWithExclusions="id,style,class,styleClass"
>
<div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div"
style="z-index: 1;"></div>
@@ -73,7 +73,7 @@
style="#{component.shadowStyle}" >
</div>
- <div style="position: absolute; overflow: hidden; z-index: 2;"
+ <div style="position: absolute; overflow: hidden; z-index: 2; #{component.attributes['style']}"
class="dr-mpnl-pnl" id="#{clientId}ContentDiv">
<a href="#" class="dr-mpnl-pnl-a" id="#{clientId}FirstHref" >_</a>
18 years, 8 months
JBoss Rich Faces SVN: r2852 - trunk/samples/modalpanel-sample/src/main/webapp/pages.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-10 15:44:03 -0400 (Mon, 10 Sep 2007)
New Revision: 2852
Modified:
trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
Log:
Fixed: modal panel ignored style attribute
Modified: trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-09-10 19:32:04 UTC (rev 2851)
+++ trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-09-10 19:44:03 UTC (rev 2852)
@@ -71,7 +71,7 @@
<h:panelGrid rendered="#{bean.containerRendered}" columns="1" style="position: relative; top: 550px; left: 100px;">
- <mp:modalPanel resizeable="#{bean.resizeable}" moveable="#{bean.moveable}" minHeight="100" top="10" width="450" id="_panel" controlsClass="pointerCursor">
+ <mp:modalPanel style="border: 1px solid navy;" resizeable="#{bean.resizeable}" moveable="#{bean.moveable}" minHeight="100" top="10" width="450" id="_panel" controlsClass="pointerCursor">
<f:facet name="header">
<f:verbatim>
Header
18 years, 8 months
JBoss Rich Faces SVN: r2851 - trunk/samples/dragDropDemo/src/main/webapp/pages.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-10 15:32:04 -0400 (Mon, 10 Sep 2007)
New Revision: 2851
Modified:
trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp
Log:
Fixed: changing style of default drag indicator had no effect
Modified: trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-09-10 19:32:00 UTC (rev 2850)
+++ trunk/samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-09-10 19:32:04 UTC (rev 2851)
@@ -71,7 +71,7 @@
</h:dataTable>
</h:panelGrid>
- <dnd:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject">
+ <dnd:dragIndicator id="indicator" acceptClass="accept" rejectClass="reject" style="width: 500px;">
<f:facet name="single">
<f:verbatim>
{marker} <b>{testDrag}</b> {label}
@@ -89,7 +89,7 @@
<h:panelGrid columns="1" style="position: relative; left: 140px;">
<h:panelGrid columns="1" style="position: absolute; top: 30px; left: 300px;">
- <dnd:dragIndicator id="defaultIndicator">
+ <dnd:dragIndicator id="defaultIndicator" style="width: 400px;">
</dnd:dragIndicator>
</h:panelGrid>
</h:panelGrid>
18 years, 8 months
JBoss Rich Faces SVN: r2850 - in trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-10 15:32:00 -0400 (Mon, 10 Sep 2007)
New Revision: 2850
Modified:
trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss
trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
Log:
Fixed: changing style of default drag indicator had no effect
Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss
===================================================================
--- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2007-09-10 18:34:58 UTC (rev 2849)
+++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2007-09-10 19:32:00 UTC (rev 2850)
@@ -13,7 +13,6 @@
.drgind_internal{
opacity:0.93;
filter:alpha(opacity=93);
- position : absolute;
}
.drgind_wordcut{
@@ -32,6 +31,8 @@
border-right-width: 2px;
border-right-style: solid;
+
+ width: 99%;
}
.drgind_marker {
@@ -45,6 +46,8 @@
border-left-style: solid;
vertical-align : top;
+
+ width: 1%;
}
]]></f:verbatim>
Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
===================================================================
--- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-09-10 18:34:58 UTC (rev 2849)
+++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-09-10 19:32:00 UTC (rev 2850)
@@ -130,7 +130,7 @@
[
new E('table',
{
- 'style':'height : 100%',
+ 'style':'height : 100%; width: 100%;',
'className':'drgind_internal',
'cellspacing':'0',
'cellpadding':'3',
18 years, 8 months
JBoss Rich Faces SVN: r2849 - trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-10 14:34:58 -0400 (Mon, 10 Sep 2007)
New Revision: 2849
Added:
trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxIncludeRendererTest.java
Log:
JUnit tests for AjaxIncludeRenderer class.
Added: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxIncludeRendererTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxIncludeRendererTest.java (rev 0)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxIncludeRendererTest.java 2007-09-10 18:34:58 UTC (rev 2849)
@@ -0,0 +1,103 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * 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.ajax4jsf.renderkit.html;
+
+import javax.faces.component.UIForm;
+import javax.faces.component.UIOutput;
+import javax.faces.component.html.HtmlForm;
+
+import org.ajax4jsf.component.UIInclude;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
+import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+public class AjaxIncludeRendererTest extends AbstractAjax4JsfTestCase {
+ private UIInclude include1 = null;
+ private UIInclude include2 = null;
+ private UIInclude include3 = null;
+ private UIForm form;
+
+ public AjaxIncludeRendererTest(String name) {
+ super(name);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ form = new HtmlForm();
+ form.setId("form");
+ facesContext.getViewRoot().getChildren().add(form);
+
+ include1 = (UIInclude)application.createComponent(UIInclude.COMPONENT_TYPE);
+ include1.setId("include1");
+ include1.setLayout(UIInclude.LAYOUT_INLINE);
+
+ UIOutput output = (UIOutput) application.createComponent(UIOutput.COMPONENT_TYPE);
+ output.setRendered(true);
+ output.setId("output");
+ output.setValue("output");
+ include1.getChildren().add(output);
+
+ include2 = (UIInclude)application.createComponent(UIInclude.COMPONENT_TYPE);
+ include2.setId("include2");
+ include2.setLayout(UIInclude.LAYOUT_BLOCK);
+
+ include3 = (UIInclude)application.createComponent(UIInclude.COMPONENT_TYPE);
+ include3.setId("include3");
+ include3.setLayout(UIInclude.LAYOUT_INLINE);
+
+ form.getChildren().add(include1);
+ form.getChildren().add(include2);
+ form.getChildren().add(include3);
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ include1 = null;
+ include2 = null;
+ include3 = null;
+ }
+
+ public void testRender() throws Exception {
+ HtmlPage page = renderView();
+ assertNotNull(page);
+ System.out.println(page.asXml());
+
+ try {
+ HtmlElement empty = page.getHtmlElementById(include1.getClientId(facesContext));
+ assertFalse(true);
+ } catch (ElementNotFoundException e) {
+
+ }
+
+ HtmlElement div = page.getHtmlElementById(include2.getClientId(facesContext));
+ assertNotNull(div);
+ assertEquals("div", div.getNodeName());
+
+ HtmlElement span = page.getHtmlElementById(include3.getClientId(facesContext));
+ assertNotNull(span);
+ assertEquals("span", span.getNodeName());
+ }
+}
18 years, 8 months
JBoss Rich Faces SVN: r2848 - trunk/ui/core/src/test/java/org/ajax4jsf/component.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-10 14:06:59 -0400 (Mon, 10 Sep 2007)
New Revision: 2848
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java
Log:
JUnit tests for UIInclude class.
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java 2007-09-10 17:45:04 UTC (rev 2847)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java 2007-09-10 18:06:59 UTC (rev 2848)
@@ -25,8 +25,8 @@
import javax.faces.component.html.HtmlForm;
public class IncludeComponentTest extends org.ajax4jsf.tests.AbstractAjax4JsfTestCase {
- UIInclude include = null;
- UIForm form = null;
+ private UIInclude include = null;
+ private UIForm form = null;
public IncludeComponentTest(String name) {
super(name);
@@ -41,7 +41,7 @@
include = (UIInclude) application.createComponent(UIInclude.COMPONENT_TYPE);
include.setId("include");
- include.setLayout("none");
+ include.setLayout(UIInclude.LAYOUT_NONE);
form.getChildren().add(include);
@@ -50,6 +50,7 @@
public void tearDown() throws Exception {
super.tearDown();
+ form = null;
include = null;
}
@@ -72,11 +73,10 @@
include.setLayout(null);
assertNull(include.getLayout());
- String layout = "block";
- include.setLayout(layout);
+ include.setLayout(UIInclude.LAYOUT_BLOCK);
String newLayout = include.getLayout();
assertNotNull(newLayout);
- assertEquals(layout, newLayout);
+ assertEquals(UIInclude.LAYOUT_BLOCK, newLayout);
}
public void testAjaxRendered() throws Exception {
18 years, 8 months
JBoss Rich Faces SVN: r2847 - trunk/ui/core/src/test/java/org/ajax4jsf/component.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-10 13:45:04 -0400 (Mon, 10 Sep 2007)
New Revision: 2847
Added:
trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java
Log:
JUnit tests for UIInclude class.
Added: trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java (rev 0)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/IncludeComponentTest.java 2007-09-10 17:45:04 UTC (rev 2847)
@@ -0,0 +1,86 @@
+/**
+ * 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.ajax4jsf.component;
+
+import javax.faces.component.UIForm;
+import javax.faces.component.html.HtmlForm;
+
+public class IncludeComponentTest extends org.ajax4jsf.tests.AbstractAjax4JsfTestCase {
+ UIInclude include = null;
+ UIForm form = null;
+
+ public IncludeComponentTest(String name) {
+ super(name);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ form = new HtmlForm();
+ form.setId("form");
+ facesContext.getViewRoot().getChildren().add(form);
+
+ include = (UIInclude) application.createComponent(UIInclude.COMPONENT_TYPE);
+ include.setId("include");
+ include.setLayout("none");
+
+ form.getChildren().add(include);
+
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ include = null;
+ }
+
+ public void testState() throws Exception {
+
+ }
+
+ public void testViewId() throws Exception {
+ include.setViewId(null);
+ assertNull(include.getViewId());
+
+ String viewId = "viewId";
+ include.setViewId(viewId);
+ String newViewId = include.getViewId();
+ assertNotNull(newViewId);
+ assertEquals(viewId, newViewId);
+ }
+
+ public void testLayout() throws Exception {
+ include.setLayout(null);
+ assertNull(include.getLayout());
+
+ String layout = "block";
+ include.setLayout(layout);
+ String newLayout = include.getLayout();
+ assertNotNull(newLayout);
+ assertEquals(layout, newLayout);
+ }
+
+ public void testAjaxRendered() throws Exception {
+ assertFalse(include.isAjaxRendered());
+ }
+
+}
18 years, 8 months
JBoss Rich Faces SVN: r2846 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-10 13:35:24 -0400 (Mon, 10 Sep 2007)
New Revision: 2846
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
Log:
TODO added
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-09-10 17:32:50 UTC (rev 2845)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-09-10 17:35:24 UTC (rev 2846)
@@ -173,6 +173,8 @@
oldRowKey = rowKey;
Iterator iterator = rowKey.getSubPathIterator(commonPathLength);
while (iterator.hasNext()) {
+ //TODO nick - check rowTreeData for null
+
Object pathSegment = iterator.next();
TreeNode childRowTreeData = rowTreeData.getChild(pathSegment);
18 years, 8 months