Author: amarkhel Date: 2009-11-06 05:03:04 -0500 (Fri, 06 Nov 2009) New Revision: 15847 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/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: Modified: branches/sandbox/3.3.X_JSF2/framework/api/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/api/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/api/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -8,7 +8,7 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</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-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/impl/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -9,7 +9,7 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <build> <resources> <resource> @@ -56,7 +56,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> - <version>${root.version}</version> + <version>3.3.3-SNAPSHOT</version> <executions> <execution> <goals> @@ -161,7 +161,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</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-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-11-06 10:03:04 UTC (rev 15847) @@ -253,7 +253,7 @@ } } // Broadcast phase events. - broadcastEvents(context, phase); + pushEvents(context, phase); // Process afterPhase listeners. processPhaseListeners(context, phase, false); } @@ -283,7 +283,7 @@ * @param phaseId - * phase, for which events must be processed. */ - public void broadcastEvents(FacesContext context, PhaseId phaseId) { + void pushEvents(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/jsf-test/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/jsf-test/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -10,29 +10,27 @@ <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</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> + <jsf.api.version>2.0.1</jsf.api.version> + <jsf.impl.version>2.0.1</jsf.impl.version> </properties> <dependencies> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-Beta2</version> + <version>2.0.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.0-Beta2</version> + <version>2.0.1</version> <scope>provided</scope> </dependency> </dependencies> @@ -44,8 +42,6 @@ <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> Modified: branches/sandbox/3.3.X_JSF2/framework/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <build> @@ -60,16 +60,14 @@ <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> + <jsf.api.version>2.0.1</jsf.api.version> + <jsf.impl.version>2.0.1</jsf.impl.version> </properties> <dependencies> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-Beta2</version> + <version>2.0.1</version> <scope>provided</scope> </dependency> </dependencies> @@ -81,8 +79,6 @@ <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> @@ -104,7 +100,7 @@ <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> + <version>1.1.15.B1</version> <optional>true</optional> </dependency> <dependency> Modified: branches/sandbox/3.3.X_JSF2/framework/test/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/framework/test/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/framework/test/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> <profiles> @@ -16,16 +16,14 @@ <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> + <jsf.api.version>2.0.1</jsf.api.version> + <jsf.impl.version>2.0.1</jsf.impl.version> </properties> <dependencies> <dependency> <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.0-Beta2</version> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> <scope>provided</scope> </dependency> </dependencies> @@ -37,13 +35,11 @@ <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> + <artifactId>jsf-impl</artifactId> <version>1.2_12</version> <scope>provided</scope> </dependency> Modified: branches/sandbox/3.3.X_JSF2/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -113,6 +113,12 @@ <url>http://download.java.net/maven/1</url> <layout>legacy</layout> </repository> +<repository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/2/</url> + <layout>default</layout> +</repository> <repository> <releases /> @@ -313,10 +319,8 @@ <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> + <jsf.api.version>2.0.1</jsf.api.version> + <jsf.impl.version>2.0.1</jsf.impl.version> </properties> </profile> @@ -327,8 +331,6 @@ <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> Modified: branches/sandbox/3.3.X_JSF2/ui/pom.xml =================================================================== --- branches/sandbox/3.3.X_JSF2/ui/pom.xml 2009-11-06 06:56:53 UTC (rev 15846) +++ branches/sandbox/3.3.X_JSF2/ui/pom.xml 2009-11-06 10:03:04 UTC (rev 15847) @@ -85,17 +85,20 @@ <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> + <jsf.api.version>2.0.1</jsf.api.version> + <jsf.impl.version>2.0.1</jsf.impl.version> </properties> <dependencies> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-Beta2</version> + <version>2.0.1</version> <scope>provided</scope> + </dependency><dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + <scope>provided</scope> </dependency> </dependencies> </profile> @@ -106,8 +109,6 @@ <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> @@ -116,6 +117,12 @@ <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> @@ -178,18 +185,18 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>${richfaces.version}</version> + <version>3.3.3-jsf2-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> + <version>1.1.15.B1</version> <optional>true</optional> </dependency> <dependency>