You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/05/26 11:19:52 UTC
svn commit: r778632 [1/2] - in
/myfaces/tobago/branches/tobago-1.0.x/example/addressbook: ./ lib/ lib/src/
lib/src/main/ lib/src/main/java/
lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/
lib/src/main/java/org/apache/myfaces/tobago/exa...
Author: lofwyr
Date: Tue May 26 09:19:48 2009
New Revision: 778632
URL: http://svn.apache.org/viewvc?rev=778632&view=rev
Log:
TOBAGO-756: Split the Addressbook Demo into 2 Parts:
1.) A library
2.) The Web-App
This demonstrates the packaging of resources and components into a JAR file and the usage of it other projects.
Added:
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/META-INF/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/ (with props)
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/admin.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/memory.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/editor.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/list.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/start.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/business.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/misc.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/personal.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/tobago-resource/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/tobago-resource/html/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-de.png (props changed)
- copied unchanged from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/icon/flag-de.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-gb.png (props changed)
- copied unchanged from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/icon/flag-gb.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-us.png (props changed)
- copied unchanged from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/icon/flag-us.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/error/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/error/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/pom.xml
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/resources/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/resources/log4j.xml (props changed)
- copied unchanged from r773837, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/log4j.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/faces-config.xml
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/web.xml
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/error.xhtml
- copied unchanged from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/auth/error.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/login.xhtml
- copied unchanged from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/auth/login.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/logout.xhtml
- copied unchanged from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/auth/logout.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/index.jsp
- copied, changed from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/index.jsp
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/test/ (props changed)
- copied from r773502, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/test/
Removed:
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource/html/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/META-INF/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/error/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/resources/log4j.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/webapp/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/test/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/classes/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tags/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/application/
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/error.jsp
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/login.jsp
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/auth/logout.jsp
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/icon/flag-de.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/icon/flag-gb.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/icon/flag-us.png
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/tobago-resource/
Modified:
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/AdminController.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Countries.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressValidator.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LocaleConverter.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/MessageUtils.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/RandomAddressGenerator.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource.properties
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_de.properties
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_en_GB.properties
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/war/src/main/webapp/WEB-INF/tobago-config.xml
Copied: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml (from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml?p2=myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml&p1=myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml&r1=773839&r2=778632&rev=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml Tue May 26 09:19:48 2009
@@ -19,83 +19,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-example</artifactId>
+ <artifactId>tobago-example-addressbook</artifactId>
<version>1.0.21-SNAPSHOT</version>
</parent>
- <artifactId>tobago-example-addressbook</artifactId>
- <packaging>war</packaging>
- <name>Example Addressbook</name>
+ <artifactId>tobago-example-addressbook-lib</artifactId>
+ <packaging>jar</packaging>
+ <name>Example Addressbook Library</name>
<build>
- <finalName>tobago-example-addressbook</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>/</contextPath>
- <userRealms>
- <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
- <name>addressbook-realm</name>
- <config>src/test/resources/realm.properties</config>
- </userRealm>
- </userRealms>
- </configuration>
- <dependencies>
- <!--dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <type>jar</type>
- </dependency-->
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.tango-project</groupId>
- <artifactId>tango-icon-theme</artifactId>
- <version>0.8.0</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}/tobago-resource/html/standard/standard/image
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -115,15 +47,20 @@
</build>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.20/example/addressbook</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.20/example/addressbook</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/tobago/tags/tobago-1.0.20/example/addressbook</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.20/example/addressbook/lib</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.20/example/addressbook/lib</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/tobago/tags/tobago-1.0.20/example/addressbook/lib</url>
</scm>
<dependencies>
+ <dependency>
+ <groupId>org.tango-project</groupId>
+ <artifactId>tango-icon-theme</artifactId>
+ <version>0.8.0</version>
+ </dependency>
<!-- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <version>${openjpa.version}</version>
</dependency>-->
<!--dependency>
<groupId>org.apache.openjpa</groupId>
@@ -271,6 +208,7 @@
<artifactId>standard</artifactId>
</dependency>
</dependencies>
+
<profiles>
<profile>
<id>myfaces</id>
@@ -336,8 +274,9 @@
</dependencies>
</profile>
</profiles>
+
<properties>
<openjpa.version>1.0.1</openjpa.version>
<spring.version>2.5</spring.version>
</properties>
-</project>
\ No newline at end of file
+</project>
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 26 09:19:48 2009
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/example/addressbook/src/main/java:699460,699891-700092,743495-743708,744771-744909,744926
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java Tue May 26 09:19:48 2009
@@ -20,22 +20,22 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.persistence.CascadeType;
import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PostLoad;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.PostLoad;
-import javax.persistence.OneToOne;
-import javax.persistence.CascadeType;
import javax.persistence.Version;
+import java.io.Serializable;
import java.util.Date;
import java.util.Locale;
-import java.io.Serializable;
@Entity
public class Address implements Serializable {
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java Tue May 26 09:19:48 2009
@@ -20,8 +20,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.ServletContextListener;
import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import java.sql.DriverManager;
/*
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/Picture.java Tue May 26 09:19:48 2009
@@ -17,13 +17,13 @@
* limitations under the License.
*/
-import javax.persistence.Entity;
-import javax.persistence.Lob;
import javax.persistence.Basic;
+import javax.persistence.Entity;
import javax.persistence.FetchType;
-import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
import java.io.Serializable;
/*
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/AdminController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/AdminController.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/AdminController.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/AdminController.java Tue May 26 09:19:48 2009
@@ -17,12 +17,12 @@
* limitations under the License.
*/
-import org.springframework.stereotype.Component;
import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.BoundedRangeModel;
import javax.annotation.security.RolesAllowed;
+import javax.swing.BoundedRangeModel;
+import javax.swing.DefaultBoundedRangeModel;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Countries.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Countries.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Countries.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Countries.java Tue May 26 09:19:48 2009
@@ -17,13 +17,13 @@
* limitations under the License.
*/
-import org.springframework.stereotype.Component;
import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
import javax.faces.model.SelectItem;
import java.util.ArrayList;
-import java.util.Locale;
import java.util.Collections;
+import java.util.Locale;
@Component("countries")
@Scope(value = "session")
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressValidator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressValidator.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressValidator.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/EmailAddressValidator.java Tue May 26 09:19:48 2009
@@ -19,12 +19,12 @@
import org.apache.myfaces.tobago.example.addressbook.EmailAddress;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class EmailAddressValidator implements Validator {
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LocaleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LocaleConverter.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LocaleConverter.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LocaleConverter.java Tue May 26 09:19:48 2009
@@ -17,10 +17,10 @@
* limitations under the License.
*/
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
import java.util.Locale;
public class LocaleConverter implements Converter {
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/LoggingController.java Tue May 26 09:19:48 2009
@@ -17,30 +17,30 @@
* limitations under the License.
*/
-import org.apache.log4j.Logger;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import org.apache.log4j.Appender;
-import org.apache.myfaces.tobago.model.SelectItem;
+import org.apache.log4j.Logger;
import org.apache.myfaces.tobago.component.UIInput;
import org.apache.myfaces.tobago.example.addressbook.Log4jUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.stereotype.Component;
+import org.apache.myfaces.tobago.model.SelectItem;
import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
import javax.servlet.ServletResponse;
-import java.util.List;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
import java.util.Set;
-import java.io.IOException;
-import java.io.FileInputStream;
/**
* User: idus
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/MessageUtils.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/MessageUtils.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/MessageUtils.java Tue May 26 09:19:48 2009
@@ -17,10 +17,10 @@
* limitations under the License.
*/
-import javax.faces.context.FacesContext;
import javax.faces.application.FacesMessage;
-import java.util.ResourceBundle;
+import javax.faces.context.FacesContext;
import java.text.MessageFormat;
+import java.util.ResourceBundle;
public class MessageUtils {
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/PictureServlet.java Tue May 26 09:19:48 2009
@@ -17,18 +17,18 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.util.VariableResolverUtil;
-import org.apache.myfaces.tobago.example.addressbook.Address;
-import org.apache.myfaces.tobago.example.addressbook.Picture;
-import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.example.addressbook.Address;
+import org.apache.myfaces.tobago.example.addressbook.Picture;
+import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
+import org.apache.myfaces.tobago.util.VariableResolverUtil;
-import javax.servlet.http.HttpServletResponse;
import javax.faces.context.FacesContext;
-import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
public class PictureServlet extends NonFacesRequestServlet {
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/RandomAddressGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/RandomAddressGenerator.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/RandomAddressGenerator.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/RandomAddressGenerator.java Tue May 26 09:19:48 2009
@@ -17,11 +17,11 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.example.addressbook.Address;
import org.apache.commons.lang.math.RandomUtils;
+import org.apache.myfaces.tobago.example.addressbook.Address;
-import java.util.Locale;
import java.util.Calendar;
+import java.util.Locale;
/**
* Tries to generate random, uncontroversial addresses.
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/SelectItemComparator.java Tue May 26 09:19:48 2009
@@ -18,8 +18,8 @@
*/
import javax.faces.model.SelectItem;
-import java.util.Comparator;
import java.io.Serializable;
+import java.util.Comparator;
public class SelectItemComparator implements Comparator<SelectItem>, Serializable {
private static final long serialVersionUID = -1581955960510873296L;
Copied: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java (from r773839, myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java?p2=myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java&p1=myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java&r1=773839&r2=778632&rev=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/StartupPhaseListener.java Tue May 26 09:19:48 2009
@@ -63,7 +63,7 @@
if (!BooleanUtils.toBoolean(loggedIn)) {
try {
externalContext.getSessionMap().put(LOGGED_IN, Boolean.TRUE);
- String forward = externalContext.getRequestContextPath() + "/faces/application/start.xhtml";
+ String forward = externalContext.getRequestContextPath() + "/faces/addressbook/start.xhtml";
externalContext.redirect(externalContext.encodeResourceURL(forward));
} catch (Exception e) {
LOG.error("", e);
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 26 09:19:48 2009
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/example/addressbook/src/main/resources/META-INF:699460,699891-700092,743495-743708,744771-744909,744926
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/admin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/admin.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/admin.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/admin.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/addressbook/layout/basic.xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="Administration"/>
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px" rows="*;fixed"/>
+ </f:facet>
+
+ <tc:tabGroup switchType="reloadPage">
+ <tc:tab label="Memory">
+ <ui:include src="memory.xhtml"/>
+ </tc:tab>
+ <tc:tab label="Logging">
+ <ui:include src="logging.xhtml"/>
+ </tc:tab>
+ </tc:tabGroup>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button label="Back" action="list"/>
+ </tc:panel>
+ </ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<tc:panel xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <f:facet name="layout">
+ <tc:gridLayout rows="2*;3*;fixed" margin="10"/>
+ </f:facet>
+
+ <tc:box label="Appenders">
+ <tc:sheet columns="*;*;*;2*" var="appender" value="#{logging.appenders}">
+ <tc:column label="Class">
+ <tc:out value="#{appender.className}"/>
+ </tc:column>
+ <tc:column label="Name">
+ <tc:out value="#{appender.name}"/>
+ </tc:column>
+ <tc:column label="File">
+ <tc:link inline="true" action="#{logging.downloadLogFile}" tip="Download Log File"
+ target="_blank" rendered="#{! empty appender.file}">
+ <f:param value="#{appender}" binding="#{logging.currentAppender}"/>
+ <tc:out value="#{appender.file}"/>
+ </tc:link>
+ </tc:column>
+ <tc:column label="Layout">
+ <tc:out value="#{appender.layout}"/>
+ </tc:column>
+ </tc:sheet>
+ </tc:box>
+
+ <tc:box label="Categories">
+ <f:facet name="layout">
+ <tc:gridLayout rows="*;fixed"/>
+ </f:facet>
+ <tc:sheet columns="5*;25px;*" var="category"
+ value="#{logging.categories}" showDirectLinks="left" showPageRange="right"
+ first="#{logging.catergoriesFirst}" rows="#{logging.catergoriesRows}">
+ <tc:column label="Name" sortable="true">
+ <tc:link inline="true" action="#{logging.selectCategory}" immediate="true">
+ <f:param value="#{category}" binding="#{logging.currentCategory}"/>
+ <tc:out value="#{category.name}"/>
+ <tc:attribute name="renderedPartially" value=":page:addCategory"/>
+ </tc:link>
+ </tc:column>
+ <tc:column label="Inh" tip="Inherited" sortable="true">
+ <tc:selectBooleanCheckbox readonly="true" value="#{category.inherited}"/>
+ </tc:column>
+ <tc:column label="Level" sortable="true">
+ <tc:selectOneChoice value="#{category.level}">
+ <tc:selectItems value="#{logging.levels}"/>
+ </tc:selectOneChoice>
+ </tc:column>
+ </tc:sheet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button label="Update" action="#{logging.updateCategories}"/>
+ </tc:panel>
+ </tc:box>
+
+ <tc:box label="Add Category" id="addCategory">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed"/>
+ </f:facet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;*;fixed"/>
+ </f:facet>
+ <tx:in label="Category" value="#{logging.category}"
+ binding="#{logging.categoryControl}"/>
+ <tx:selectOneChoice label="Level" value="#{logging.level}">
+ <tc:selectItems value="#{logging.levels}"/>
+ </tx:selectOneChoice>
+ <tc:button label="Set Level" action="#{logging.addCategory}"/>
+ </tc:panel>
+ </tc:box>
+
+</tc:panel>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/memory.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/memory.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/memory.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/memory.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<tc:panel xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px" rows="fixed;fixed;fixed;*" columns="300px;*"/>
+ </f:facet>
+ <f:facet name="reload">
+ <tc:reload frequency="5000" update="#{admin.updateMemory}" />
+ </f:facet>
+
+ <tc:label value="Memory:" />
+ <tc:cell/>
+
+ <tc:progress value="#{admin.memory}" markup="#{admin.state}" />
+ <tc:cell/>
+
+ <tc:label value="Current: #{admin.memory.value} kB Max: #{admin.memory.maximum} kB" />
+ <tc:cell/>
+
+ <tc:cell spanX="2"/>
+
+</tc:panel>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/editor.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/editor.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/editor.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/addressbook/layout/basic.xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{bundle.editorTitle}"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px"/>
+ </f:facet>
+
+ <tc:box label="#{bundle.editorBoxTitle}">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;1*;fixed"/>
+ </f:facet>
+
+ <tc:messages/>
+
+ <tc:tabGroup switchType="reloadTab" immediate="true">
+ <tc:tab label="#{bundle.editorTabPersonal}">
+ <ui:include src="tab/personal.xhtml"/>
+ </tc:tab>
+
+ <tc:tab label="#{bundle.editorTabBusiness}" rendered="#{!controller.simple}">
+ <ui:include src="tab/business.xhtml"/>
+ </tc:tab>
+
+ <tc:tab label="#{bundle.editorTabMisc}" rendered="#{!controller.simple}">
+ <ui:include src="tab/misc.xhtml"/>
+ </tc:tab>
+ </tc:tabGroup>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="3*;1*;1*"/>
+ </f:facet>
+
+ <tc:cell/>
+ <tc:button action="#{controller.store}"
+ label="#{bundle.editorStore}" defaultCommand="true"/>
+ <tc:button action="#{controller.cancel}" immediate="true"
+ label="#{bundle.editorCancel}"/>
+ </tc:panel>
+
+ </tc:box>
+
+ </tc:panel>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <f:view locale="#{controller.language}">
+ <tc:loadBundle basename="resource" var="bundle"/>
+
+ <tc:page applicationIcon="icon/favicon.ico" label="${title}" state="#{layout}" width="#{layout.width}"
+ height="#{layout.height}" id="page">
+ <f:facet name="menuBar">
+ <tc:menuBar>
+ <tc:form>
+ <tc:menu label="#{bundle.menuFile}">
+ <tc:menuItem label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
+ <tc:menuItem label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
+ <tc:menuSeparator/>
+ <tc:menuItem label="#{bundle.admin}" action="#{admin.admin}"
+ image="image/org/tango-project/tango-icon-theme/16x16/categories/preferences-system.png"/>
+ <tc:menuSeparator/>
+ <tc:menuItem label="Logout" action="#{controller.logout}"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
+ </tc:menu>
+
+ <tc:menu label="#{bundle.menuSettings}">
+ <tc:menu label="#{bundle.menuSettingsLanguage}">
+ <tx:menuRadio action="#{controller.languageChanged}"
+ value="#{controller.language}">
+ <f:selectItems value="#{controller.languages}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tc:menu label="#{bundle.menuSettingsTheme}">
+ <tx:menuRadio action="#{controller.themeChanged}"
+ value="#{controller.theme}">
+ <f:selectItems value="#{controller.themeItems}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tc:menuCheckbox label="#{bundle.menuSettingsMode}" value="#{controller.simple}"/>
+ </tc:menu>
+
+ <tc:menu label="#{bundle.menuHelp}">
+ <tc:menuItem label="#{bundle.menuHelpAbout}"
+ image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png">
+ <tc:popupReference for=":page:about"/>
+ </tc:menuItem>
+ </tc:menu>
+ </tc:form>
+ </tc:menuBar>
+ </f:facet>
+
+ <tc:cell>
+ <ui:insert/>
+ </tc:cell>
+
+ <tc:popup id="about" width="300px" height="220px" left="200px" top="200px">
+ <tc:box label="About">
+ <f:facet name="layout">
+ <tc:gridLayout rows="150px;*;fixed" columns="150px;*"/>
+ </f:facet>
+
+ <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
+ height="150"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ </f:facet>
+
+ <tc:out markup="strong" value="Addressbook Demo"/>
+ <tc:cell/>
+ <tc:out value="Version 1.0"/>
+ <tc:cell/>
+ </tc:panel>
+
+ <tc:cell spanX="2"/>
+
+ <tc:cell spanX="2">
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button label="OK">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ </tc:panel>
+ </tc:cell>
+ </tc:box>
+ </tc:popup>
+
+ </tc:page>
+ </f:view>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/list.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/list.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/list.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/list.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/addressbook/layout/basic.xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{bundle.listPageTitle}"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px" rows="fixed;fixed;1*;fixed"/>
+ </f:facet>
+ <tc:toolBar iconSize="big">
+ <tc:button label="#{bundle.toolbarAddressList}" action="#{controller.search}" immediate="true"
+ image="image/org/tango-project/tango-icon-theme/32x32/mimetypes/x-office-address-book.png"
+ disabled="#{facesContext.viewRoot.viewId == '/addressbook/list.xhtml'}"/>
+ <tc:button label="#{bundle.listNew}" action="#{controller.createAddress}"
+ image="image/org/tango-project/tango-icon-theme/32x32/actions/contact-new.png"/>
+ <tc:button label="#{bundle.toolbarAbout}"
+ image="image/org/tango-project/tango-icon-theme/32x32/apps/help-browser.png">
+ <tc:popupReference for=":page:about"/>
+ </tc:button>
+ <tc:button label="#{bundle.admin}" action="#{admin.admin}"
+ image="image/org/tango-project/tango-icon-theme/32x32/categories/preferences-system.png"/>
+ </tc:toolBar>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed"/>
+ </f:facet>
+ <tx:in label="#{bundle.listFilter}"
+ value="#{controller.searchCriterion}"/>
+ <tc:button action="#{controller.search}" label="#{bundle.listSearch}"
+ defaultCommand="true"/>
+ </tc:panel>
+
+ <tc:box label="#{bundle.listBoxTitle}">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;1*"/>
+ </f:facet>
+ <f:facet name="toolBar">
+ <tc:toolBar>
+ <tc:toolBarCommand label="#{bundle.listNew}" action="#{controller.createAddress}"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
+ <tc:toolBarCommand label="#{bundle.listEdit}" action="#{controller.editAddress}"
+ image="image/org/tango-project/tango-icon-theme/16x16/apps/accessories-text-editor.png"/>
+ <tc:toolBarCommand label="#{bundle.listDelete}" action="#{controller.deleteAddresses}"
+ image="image/org/tango-project/tango-icon-theme/16x16/places/user-trash.png">
+ <f:facet name="confirmation">
+ <tc:out value="#{bundle.listDeleteConfirmation}"/>
+ </f:facet>
+ </tc:toolBarCommand>
+ <tc:toolBarCommand label="Select Columns" action="#{controller.selectColumns}"
+ image="image/org/tango-project/tango-icon-theme/16x16/categories/applications-system.png">
+ <f:facet name="popup">
+ <tc:popup width="300px" height="200px" left="200px" top="200px"
+ rendered="#{controller.renderPopup}" id="popup">
+ <tc:box label="Select Columns">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;1*;fixed" margin="10"/>
+ </f:facet>
+
+ <tc:selectBooleanCheckbox label="First Name" value="#{controller.renderFirstName}"/>
+ <tc:selectBooleanCheckbox label="Last Name" value="#{controller.renderLastName}"/>
+ <tc:selectBooleanCheckbox label="Birthday" value="#{controller.renderDayOfBirth}"/>
+ <tc:cell/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;100px;100px"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button action="#{controller.cancelPopup}" label="OK" defaultCommand="true"/>
+ <tc:button action="#{controller.cancelPopup}" label="Cancel" immediate="true"/>
+ </tc:panel>
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:toolBarCommand>
+ </tc:toolBar>
+ </f:facet>
+
+ <tc:messages/>
+
+ <tc:sheet columns="1*;1*;1*" value="#{controller.currentAddressList}"
+ var="address" state="#{controller.selectedAddresses}"
+ sortActionListener="#{controller.sheetSorter}" rows="25"
+ showRowRange="left" showPageRange="right" showDirectLinks="center">
+ <tc:columnEvent event="dblclick">
+ <tc:command action="#{controller.editAddress}"/>
+ </tc:columnEvent>
+ <tc:column id="firstName" label="#{bundle.listFirstName}" sortable="true"
+ rendered="#{controller.renderFirstName}">
+ <tc:out value="#{address.firstName}"/>
+ </tc:column>
+ <tc:column id="lastName" label="#{bundle.listLastName}" sortable="true"
+ rendered="#{controller.renderLastName}">
+ <tc:out value="#{address.lastName}"/>
+ </tc:column>
+ <tc:column id="dayOfBirth" label="Birthday" sortable="true"
+ rendered="#{controller.renderDayOfBirth}">
+ <tc:out value="#{address.dayOfBirth}">
+ <f:convertDateTime pattern="#{bundle.editorDatePattern}"/>
+ </tc:out>
+ </tc:column>
+ </tc:sheet>
+
+ </tc:box>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;20px;*"/>
+ </f:facet>
+ <tc:form>
+ <tx:selectOneChoice label="#{bundle.footerLanguage}"
+ value="#{controller.language}">
+ <f:selectItems value="#{controller.languages}"/>
+ <f:facet name="change">
+ <tc:command action="#{controller.languageChangedList}"/>
+ </f:facet>
+ </tx:selectOneChoice>
+ </tc:form>
+ <tc:image alt="#{bundle.footerFlag}" width="16" height="11"
+ value="#{bundle.footerFlagIcon}"/>
+ <tc:form>
+ <tx:selectOneChoice label="#{bundle.footerTheme}" value="#{controller.theme}">
+ <f:selectItems value="#{controller.themeItems}"/>
+ <f:facet name="change">
+ <tc:command action="#{controller.themeChanged}"/>
+ </f:facet>
+ </tx:selectOneChoice>
+ </tc:form>
+ </tc:panel>
+ </tc:panel>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/start.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/start.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/start.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<f:view xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:loadBundle basename="addressbook" var="bundle"/>
+
+ <tc:page label="#{bundle.editorTitle}" state="#{layout}" width="#{layout.width}" height="#{layout.height}">
+ <f:facet name="action">
+ <tc:link action="list"/>
+ </f:facet>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px" rows="*;fixed;*" columns="*;400px;*"/>
+ </f:facet>
+
+ <tc:cell spanX="3"/>
+
+ <tc:cell/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="150px" columns="150px;250px"/>
+ </f:facet>
+
+ <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
+ height="150"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
+ </f:facet>
+
+ <tc:out value="Addressbook Demo"/>
+ <tc:cell/>
+ <tc:out value="Initializing ..."/>
+ <tc:cell/>
+
+ </tc:panel>
+
+ </tc:panel>
+ <tc:cell/>
+
+ <tc:cell spanX="3"/>
+
+ </tc:panel>
+ </tc:page>
+</f:view>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/business.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/business.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/business.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/business.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <tc:loadBundle basename="resource" var="bundle"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;1*"/>
+ </f:facet>
+ <tx:in value="#{controller.currentAddress.company}"
+ label="#{bundle.editorJobCompany}"/>
+
+ <tx:in value="#{controller.currentAddress.jobTitle}"
+ label="#{bundle.editorJobTitle}"/>
+
+ <tx:in value="#{controller.currentAddress.jobPhone}"
+ label="#{bundle.editorPhone}"
+ validator="#{controller.validatePhoneNumber}"/>
+
+ <tx:in value="#{controller.currentAddress.jobEmail}"
+ label="#{bundle.editorEmail}">
+ <f:validator validatorId="EmailAddressValidator"/>
+ </tx:in>
+
+ <tx:in value="#{controller.currentAddress.jobHomePage}"
+ label="#{bundle.editorHomepage}"/>
+
+ <tc:cell/>
+
+ </tc:panel>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/misc.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/misc.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/misc.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/misc.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <tc:loadBundle basename="resource" var="bundle"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="1*"/>
+ </f:facet>
+
+ <tx:textarea value="#{controller.currentAddress.note}"
+ label="#{bundle.editorNote}"/>
+ </tc:panel>
+</ui:composition>
Added: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/personal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/personal.xhtml?rev=778632&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/personal.xhtml (added)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/tab/personal.xhtml Tue May 26 09:19:48 2009
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <tc:loadBundle basename="resource" var="bundle"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;*"/>
+ </f:facet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;120px"/>
+ </f:facet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;*"/>
+ </f:facet>
+ <tx:in value="#{controller.currentAddress.firstName}"
+ label="#{bundle.editorFirstName}" required="true">
+ <f:validateLength minimum="2" maximum="20"/>
+ </tx:in>
+
+ <tx:in label="#{bundle.editorLastName}"
+ value="#{controller.currentAddress.lastName}" required="true"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="6*;1*"/>
+ </f:facet>
+ <tx:in value="#{controller.currentAddress.street}"
+ label="#{bundle.editorStreet}"/>
+ <tc:in value="#{controller.currentAddress.houseNumber}"/>
+ </tc:panel>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;1*"/>
+ </f:facet>
+ <tx:in value="#{controller.currentAddress.zipCode}"
+ label="#{bundle.editorCity}"/>
+ <tc:in value="#{controller.currentAddress.city}"/>
+ </tc:panel>
+
+ <tx:selectOneChoice
+ value="#{controller.currentAddress.country}"
+ label="#{bundle.editorCountry}">
+ <f:selectItems value="#{countries}"/>
+ </tx:selectOneChoice>
+ <tc:cell/>
+ </tc:panel>
+ <tc:panel rendered="#{!controller.simple}">
+ <f:facet name="layout">
+ <tc:gridLayout rows="160px" columns="120px"/>
+ </f:facet>
+ <tc:form>
+ <tc:button
+ image="#{controller.currentAddress.picture != null?'${pageContext.request.contextPath}/faces/picture?id=XXXX':'image/empty-portrait.png'}"
+ action="#{controller.popupFileUpload}">
+ <f:facet name="popup">
+ <tc:popup width="300px" height="170px" left="200px"
+ top="200px" rendered="#{controller.renderFileUploadPopup}"
+ id="popup-fileUpload">
+ <tc:box label="FileUpload">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;1*;fixed" margin="10"/>
+ </f:facet>
+ <tc:file value="#{controller.uploadedFile}" required="true">
+ <tc:validateFileItem contentType="image/*"/>
+ </tc:file>
+ <tc:messages/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;100px;100px"/>
+ </f:facet>
+ <tc:cell/>
+ <tc:button action="#{controller.okFileUpload}" label="OK"/>
+ <tc:button action="#{controller.cancelFileUpload}" label="Cancel" immediate="true"/>
+ </tc:panel>
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:button>
+ </tc:form>
+ </tc:panel>
+ </tc:panel>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed"/>
+ </f:facet>
+ <tx:in value="#{controller.currentAddress.phone}"
+ label="#{bundle.editorPhone}"
+ validator="#{controller.validatePhoneNumber}"/>
+
+ <tx:in value="#{controller.currentAddress.mobile}"
+ label="#{bundle.editorMobile}"
+ validator="#{controller.validatePhoneNumber}"/>
+
+ <tx:in value="#{controller.currentAddress.fax}"
+ label="#{bundle.editorFax}"
+ validator="#{controller.validatePhoneNumber}"/>
+
+ <tx:in value="#{controller.currentAddress.email}"
+ label="#{bundle.editorEmail}">
+ <f:validator validatorId="EmailAddressValidator"/>
+ </tx:in>
+
+ <tx:in value="#{controller.currentAddress.icq}"
+ label="#{bundle.editorIcq}">
+ <f:validateLongRange minimum="0"/>
+ </tx:in>
+ <tx:in value="#{controller.currentAddress.homePage}"
+ label="#{bundle.editorHomepage}"/>
+
+ <tx:date id="dayOfBirth" value="#{controller.currentAddress.dayOfBirth}"
+ label="#{bundle.editorBirthday}">
+ <f:convertDateTime pattern="#{bundle.editorDatePattern}"/>
+ </tx:date>
+ </tc:panel>
+
+ <tc:cell/>
+
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 26 09:19:48 2009
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/example/addressbook/src/main/webapp/tobago-resource:699460,699891-700092,743495-743708,744771-744909,744926
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 26 09:19:48 2009
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/example/addressbook/src/main/webapp/tobago-resource/html:699460,699891-700092,743495-743708,744771-744909,744926
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-de.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-gb.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/image/addressbook/icon/flag-us.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/error/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 26 09:19:48 2009
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/example/addressbook/src/main/resources/error:699460,699891-700092,743495-743708,744771-744909,744926
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource.properties?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource.properties (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource.properties Tue May 26 09:19:48 2009
@@ -63,7 +63,7 @@
footerLanguage=Language
footerTheme=Theme
footerFlag=Flag
-footerFlagIcon=icon/flag-us.png
+footerFlagIcon=image/addressbook/icon/flag-us.png
# menu
menuFile=_File
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_de.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_de.properties?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_de.properties (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_de.properties Tue May 26 09:19:48 2009
@@ -60,7 +60,7 @@
footerLanguage=Sprache
footerTheme=Design
footerFlag=Flagge
-footerFlagIcon=icon/flag-de.png
+footerFlagIcon=image/addressbook/icon/flag-de.png
# menu
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_en_GB.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_en_GB.properties?rev=778632&r1=773502&r2=778632&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_en_GB.properties (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/tobago-resource2/html/standard/standard/property/resource_en_GB.properties Tue May 26 09:19:48 2009
@@ -19,4 +19,4 @@
editorDatePattern=dd/MM/yyyy
# footer
-footerFlagIcon=icon/flag-gb.png
\ No newline at end of file
+footerFlagIcon=image/addressbook/icon/flag-gb.png
\ No newline at end of file