Author: nbelaevski Date: 2008-04-07 12:48:23 -0400 (Mon, 07 Apr 2008) New Revision: 7637 Removed: trunk/samples/richfaces-demo/src/test/java/ Modified: trunk/samples/richfaces-demo/pom.xml trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Album.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Artist.java Log: Modified: trunk/samples/richfaces-demo/pom.xml =================================================================== --- trunk/samples/richfaces-demo/pom.xml 2008-04-07 16:37:17 UTC (rev 7636) +++ trunk/samples/richfaces-demo/pom.xml 2008-04-07 16:48:23 UTC (rev 7637) @@ -1,18 +1,75 @@ <?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>samples</artifactId> - <groupId>org.richfaces</groupId> - <version>3.2.1-SNAPSHOT</version> - </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>richfaces-demo</artifactId> <packaging>war</packaging> + <version>3.2.0.GA</version> <name>richfaces-demo Maven Webapp</name> - <version>3.2.1-SNAPSHOT</version> + + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url> + http://repository.jboss.com/maven2/ + </url> + </repository> + </repositories> + <build> <finalName>richfaces-demo</finalName> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <!-- + --> + <version>6.1.5</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>8080</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -179,7 +236,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.0.GA</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -187,15 +244,61 @@ <version>1.0</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.8.1</version> </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.14</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>xerces</artifactId> + <groupId>xerces</groupId> + </exclusion> + </exclusions> + </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_07</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_07</version> + <scope>runtime</scope> + </dependency> </dependencies> </project> Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Album.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Album.java 2008-04-07 16:37:17 UTC (rev 7636) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Album.java 2008-04-07 16:48:23 UTC (rev 7637) @@ -1,7 +1,7 @@ package org.richfaces.demo.tree; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import org.richfaces.model.TreeNode; @@ -12,7 +12,7 @@ */ private static final long serialVersionUID = 6514596192023597908L; private long id; - private Map songs = new HashMap(); + private Map songs = new LinkedHashMap(); private String title; private Integer year; private Artist artist; Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Artist.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Artist.java 2008-04-07 16:37:17 UTC (rev 7636) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/Artist.java 2008-04-07 16:48:23 UTC (rev 7637) @@ -1,14 +1,14 @@ package org.richfaces.demo.tree; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import org.richfaces.model.TreeNode; public class Artist implements TreeNode { private long id; - private Map albums = new HashMap(); + private Map albums = new LinkedHashMap(); private String name; private Library library;