Author: amarkhel Date: 2009-11-04 13:10:31 -0500 (Wed, 04 Nov 2009) New Revision: 15824 Modified: branches/sandbox/3.3.X_JSF2/framework/api/pom.xml branches/sandbox/3.3.X_JSF2/framework/impl/pom.xml branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml branches/sandbox/3.3.X_JSF2/framework/pom.xml branches/sandbox/3.3.X_JSF2/framework/test/pom.xml branches/sandbox/3.3.X_JSF2/pom.xml branches/sandbox/3.3.X_JSF2/ui/pom.xml Log: Add jsf2 profile Modified: branches/sandbox/3.3.X_JSF2/framework/api/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/api/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/api/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -8,7 +8,7 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> <dependencies> <dependency> <groupId>commons-collections</groupId> Modified: branches/sandbox/3.3.X_JSF2/framework/impl/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/impl/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/impl/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -9,7 +9,7 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> <build> <resources> <resource> @@ -56,7 +56,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> - <version>${project.version}</version> + <version>${root.version}</version> <executions> <execution> <goals> @@ -161,7 +161,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-11-04 18:10:31 UTC (rev 15824) @@ -283,7 +283,7 @@ * @param phaseId - * phase, for which events must be processed. */ - void broadcastEvents(FacesContext context, PhaseId phaseId) { + public void broadcastEvents(FacesContext context, PhaseId phaseId) { EventsQueue[] events = getEvents(); EventsQueue anyPhaseEvents = events[PhaseId.ANY_PHASE.getOrdinal()]; EventsQueue phaseEvents = events[phaseId.getOrdinal()]; Modified: branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/richfaces/component/UIRangedNumberInput.java 2009-11-04 18:10:31 UTC (rev 15824) @@ -102,7 +102,7 @@ return new Double(object.toString()); } - private boolean isEmpty(Object newValue) { + public static boolean isEmpty(Object newValue) { if (newValue == null) { return true; } Modified: branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -10,7 +10,60 @@ <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> + <profiles> + <profile> + <id>jsf2</id> + <properties> + <jsf.api.groupId>com.sun.faces</jsf.api.groupId> + <jsf.impl.groupId>com.sun.faces</jsf.impl.groupId> + <jsf.api.version>2.0.0-Beta2</jsf.api.version> + <jsf.impl.version>2.0.0-Beta2</jsf.impl.version> + <richfaces.version>3.3.3-jsf2-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-Beta2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.0-Beta2</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> +<profile> + <id>jsf1.2</id> + <properties> + <jsf.api.groupId>javax.faces</jsf.api.groupId> + <jsf.impl.groupId>javax.faces</jsf.impl.groupId> + <jsf.api.version>1.2_12</jsf.api.version> + <jsf.impl.version>1.2_12</jsf.impl.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <dependencies> <dependency> <groupId>junit</groupId> @@ -23,12 +76,6 @@ <version>2.4</version> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>el-impl</groupId> <artifactId>el-impl</artifactId> <version>1.0</version> @@ -99,12 +146,6 @@ <version>1.2</version> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>1.0</version> Modified: branches/sandbox/3.3.X_JSF2/framework/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <build> @@ -54,6 +54,46 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jsf2</id> + <properties> + <jsf.api.groupId>com.sun.faces</jsf.api.groupId> + <jsf.impl.groupId>com.sun.faces</jsf.impl.groupId> + <jsf.api.version>2.0.0-Beta2</jsf.api.version> + <jsf.impl.version>2.0.0-Beta2</jsf.impl.version> + <richfaces.version>3.3.3-jsf2-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-Beta2</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> +<profile> + <id>jsf1.2</id> + <properties> + <jsf.api.groupId>javax.faces</jsf.api.groupId> + <jsf.impl.groupId>javax.faces</jsf.impl.groupId> + <jsf.api.version>1.2_12</jsf.api.version> + <jsf.impl.version>1.2_12</jsf.impl.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> <dependencies> <dependency> <groupId>junit</groupId> @@ -79,30 +119,24 @@ <version>1.0.4</version> </dependency> <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</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>jstl</groupId> <artifactId>jstl</artifactId> <version>1.2</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>1.0</version> Modified: branches/sandbox/3.3.X_JSF2/framework/test/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/test/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/framework/test/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -7,9 +7,50 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> + <profiles> + <profile> + <id>jsf2</id> + <properties> + <jsf.api.groupId>com.sun.faces</jsf.api.groupId> + <jsf.impl.groupId>com.sun.faces</jsf.impl.groupId> + <jsf.api.version>2.0.0-Beta2</jsf.api.version> + <jsf.impl.version>2.0.0-Beta2</jsf.impl.version> + <richfaces.version>3.3.3-jsf2-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-Beta2</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> +<profile> + <id>jsf1.2</id> + <properties> + <jsf.api.groupId>javax.faces</jsf.api.groupId> + <jsf.impl.groupId>javax.faces</jsf.impl.groupId> + <jsf.api.version>1.2_12</jsf.api.version> + <jsf.impl.version>1.2_12</jsf.impl.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <dependencies> <dependency> <groupId>junit</groupId> @@ -42,14 +83,9 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>1.14</version> Modified: branches/sandbox/3.3.X_JSF2/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -309,6 +309,30 @@ </reporting> </profile> <profile> + <id>jsf2</id> + <properties> + <jsf.api.groupId>com.sun.faces</jsf.api.groupId> + <jsf.impl.groupId>com.sun.faces</jsf.impl.groupId> + <jsf.api.version>2.0.0-Beta2</jsf.api.version> + <jsf.impl.version>2.0.0-Beta2</jsf.impl.version> + <richfaces.version>3.3.3-jsf2-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + + </profile> +<profile> + <id>jsf1.2</id> + <properties> + <jsf.api.groupId>javax.faces</jsf.api.groupId> + <jsf.impl.groupId>javax.faces</jsf.impl.groupId> + <jsf.api.version>1.2_12</jsf.api.version> + <jsf.impl.version>1.2_12</jsf.impl.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + + </profile> + <profile> <id>beet</id> <activation> <property> Modified: branches/sandbox/3.3.X_JSF2/ui/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/ui/pom.xml 2009-11-04 11:00:56 UTC (rev 15823) +++ branches/sandbox/3.3.X_JSF2/ui/pom.xml 2009-11-04 18:10:31 UTC (rev 15824) @@ -80,6 +80,46 @@ </resources> </build> </profile> + <profile> + <id>jsf2</id> + <properties> + <jsf.api.groupId>com.sun.faces</jsf.api.groupId> + <jsf.impl.groupId>com.sun.faces</jsf.impl.groupId> + <jsf.api.version>2.0.0-Beta2</jsf.api.version> + <jsf.impl.version>2.0.0-Beta2</jsf.impl.version> + <richfaces.version>3.3.3-jsf2-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0-Beta2</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> +<profile> + <id>jsf1.2</id> + <properties> + <jsf.api.groupId>javax.faces</jsf.api.groupId> + <jsf.impl.groupId>javax.faces</jsf.impl.groupId> + <jsf.api.version>1.2_12</jsf.api.version> + <jsf.impl.version>1.2_12</jsf.impl.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> + <root.version>3.3.3-SNAPSHOT</root.version> + </properties> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + + </profiles> <modules> <module>core</module> @@ -138,12 +178,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${richfaces.version}</version> <scope>test</scope> </dependency> <dependency> @@ -182,11 +222,5 @@ <version>1.1.2</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> </dependencies> </project> \ No newline at end of file