May 2010 - richfaces-svn-commits - Jboss List Archives

JBoss Rich Faces SVN: r17216 - root/build/parent/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-05-24 15:11:56 -0400 (Mon, 24 May 2010) New Revision: 17216 Modified: root/build/parent/trunk/pom.xml Log: [maven-release-plugin] prepare release richfaces-parent-3 Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) +++ root/build/parent/trunk/pom.xml 2010-05-24 19:11:56 UTC (rev 17216) @@ -21,7 +21,7 @@ <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> <packaging>pom</packaging> - <version>3-SNAPSHOT</version> + <version>3</version> <name>RichFaces Parent</name> <parent> @@ -128,7 +128,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.4</version> + <version>4.7</version> </dependency>   @@ -435,11 +435,11 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/trunk + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/tags/r... </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/trunk + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/tags/rich... </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces</url> + <url>http://fisheye.jboss.org/browse/richfaces/tags/richfaces-parent-3</url> </scm> </project>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17215 - in root: dist/trunk and 8 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-05-24 15:11:30 -0400 (Mon, 24 May 2010) New Revision: 17215 Added: root/dist/trunk/release-notes.txt root/ui/dist/trunk/richfaces-ui/ root/ui/dist/trunk/richfaces-ui/pom.xml Modified: root/dist/trunk/pom.xml root/dist/trunk/richfaces.xml root/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/pom.xml root/ui-sandbox/tables/trunk/pom.xml root/ui/core/trunk/parent/pom.xml root/ui/core/trunk/pom.xml root/ui/dist/trunk/assembler.xml root/ui/dist/trunk/pom.xml Log: RF-8461 Add ui assembler Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/dist/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -23,6 +23,12 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> + </parent> + <groupId>org.richfaces</groupId> <artifactId>richfaces-assembler</artifactId> <version>4.0.0-SNAPSHOT</version> @@ -32,15 +38,12 @@ <modules> <module>../../build/parent/tags/richfaces-parent-1</module> <module>../../build/bom/trunk</module> -  <module>../../commons/trunk</module> <module>../../core/trunk</module> -  -  -  <module>../../examples</module> -  -  + +  + <module>../../ui/dist/trunk</module> </modules> <build> Added: root/dist/trunk/release-notes.txt =================================================================== Modified: root/dist/trunk/richfaces.xml =================================================================== --- root/dist/trunk/richfaces.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/dist/trunk/richfaces.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -8,6 +8,9 @@ <source>lgpl.txt</source> </file> <file> + <source>release-notes.txt</source> + </file> + <file> <source>readme-ui.txt</source> <destName>readme.txt</destName> </file> @@ -23,7 +26,6 @@ <include>org.richfaces.core:richfaces-core-api</include> <include>org.richfaces.core:richfaces-core-impl</include> <include>org.richfaces.commons:richfaces-commons-api</include> -  </includes> <sources> @@ -59,6 +61,38 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> + <include>org.richfaces.ui:richfaces-ui</include> + </includes> + + <sources> + <outputDirectoryMapping>/</outputDirectoryMapping> + <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <fileSets> + <fileSet> + <directory>target/apidocs</directory> + <outputDirectory>docs/javadocs/richfaces-ui</outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <includes> + <include>*-sources.jar</include> + </includes> + <outputDirectory>artifacts/ui/</outputDirectory> + </fileSet> + </fileSets> + </sources> + + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>artifacts/ui</outputDirectory> + <outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + </binaries> + </moduleSet> + + <moduleSet> + <includeSubModules>true</includeSubModules> + <includes> <include>org.richfaces.examples:core-demo</include> <include>org.richfaces.examples:richfaces-showcase</include> </includes> @@ -72,12 +106,6 @@ <include>src/**</include> <include>readme.txt</include> <include>pom.xml</include> - - </includes> </fileSet> </fileSets> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -30,9 +30,9 @@ <modules>   - <module>build/parent/trunk</module> + <module>build/parent/tags/richfaces-parent-1</module> <module>build/bom/trunk</module> - <module>build/resources/trunk/checkstyle</module> +  <module>commons/${commons.svn.dir}</module> <module>core/${core.svn.dir}</module> <module>cdk/${cdk.svn.dir}</module> Modified: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/core/trunk/parent/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -36,6 +36,10 @@ <name>Richfaces UI Components: Core Parent</name> <packaging>pom</packaging> + <properties> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -84,6 +88,17 @@ <plugins> <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0-beta-1</version> @@ -91,6 +106,7 @@ <fail>false</fail> </configuration> </plugin> + <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> @@ -117,4 +133,47 @@ </plugins> </build> + <profiles> + <profile> + <id>release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <javadocVersion>1.5</javadocVersion> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-javadoc</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <id>generate-source</id> + <phase>generate-sources</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/core/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -41,71 +41,4 @@ <module>parent</module> <module>api</module> </modules> - - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <javadocVersion>1.5</javadocVersion> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-javadoc</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <id>generate-source</id> - <phase>generate-sources</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> \ No newline at end of file Modified: root/ui/dist/trunk/assembler.xml =================================================================== --- root/ui/dist/trunk/assembler.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/dist/trunk/assembler.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,28 @@ +<assembly> + <formats> + <format>dir</format> + </formats> + + <moduleSets> + <moduleSet> + <includeSubModules>true</includeSubModules> + <includes> + <include>org.richfaces.ui:richfaces-ui-core-api</include> + <include>org.richfaces.ui-sandbox:tables-api</include> + <include>org.richfaces.ui-sandbox:tables-ui</include> + <include>org.richfaces.ui-sandbox:tables-impl</include> + </includes> + + <sources> + <outputDirectoryMapping>/</outputDirectoryMapping> + <excludeSubModuleDirectories>true</excludeSubModuleDirectories> + <fileSets> + <fileSet> + <directory>src/main/java</directory> + <outputDirectory>sources</outputDirectory> + </fileSet> + </fileSets> + </sources> + </moduleSet> + </moduleSets> +</assembly> \ No newline at end of file Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui/dist/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,55 @@ +<?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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Richfaces UI Assembler</name> + + <modules> + <module>../../core/trunk</module> + <module>../../../ui-sandbox/tables/trunk</module> + <module>richfaces-ui</module> + </modules> + + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: root/ui/dist/trunk/richfaces-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-ui/pom.xml (rev 0) +++ root/ui/dist/trunk/richfaces-ui/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -0,0 +1,206 @@ +<?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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> + </parent> + + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Richfaces UI</name> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>tables-ui</artifactId> + </dependency> + +  + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> +  + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.richfaces.ui:*</include> + <include>org.richfaces.ui-sandbox:*</include> + </includes> + </artifactSet> + <finalName>richfaces-ui-${project.version}</finalName> + <createSourcesJar>true</createSourcesJar> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> +  + <includeDependencySources>true</includeDependencySources> + + <dependencySourceIncludes> +  + <dependencySourceInclude>org.richfaces.ui:*</dependencySourceInclude> + <dependencySourceInclude>org.richfaces.ui-sandbox:*</dependencySourceInclude> + </dependencySourceIncludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -26,9 +26,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -26,9 +26,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -40,77 +40,4 @@ <module>datascroller/trunk</module> <module>componentcontrol/trunk</module> </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0-beta-2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-4</version> - <extensions>true</extensions> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> - <executions> - <execution> - <id>generate</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - <inherited>true</inherited> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <configuration> - <fail>false</fail> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: root/ui-sandbox/tables/trunk/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) +++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-24 19:11:30 UTC (rev 17215) @@ -24,9 +24,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>components</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17214 - root/build/parent/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-05-24 14:30:06 -0400 (Mon, 24 May 2010) New Revision: 17214 Modified: root/build/parent/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-24 18:29:59 UTC (rev 17213) +++ root/build/parent/trunk/pom.xml 2010-05-24 18:30:06 UTC (rev 17214) @@ -21,7 +21,7 @@ <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> <packaging>pom</packaging> - <version>2</version> + <version>3-SNAPSHOT</version> <name>RichFaces Parent</name> <parent> @@ -435,11 +435,11 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/tags/r... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/trunk </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/tags/rich... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/trunk </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/tags/richfaces-parent-2</url> + <url>http://fisheye.jboss.org/browse/richfaces</url> </scm> </project>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17213 - root/build/parent/tags.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-05-24 14:29:59 -0400 (Mon, 24 May 2010) New Revision: 17213 Added: root/build/parent/tags/richfaces-parent-2/ Log: [maven-scm] copy for tag richfaces-parent-2 Copied: root/build/parent/tags/richfaces-parent-2 (from rev 17212, root/build/parent/trunk)

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17212 - root/build/parent/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-05-24 14:29:46 -0400 (Mon, 24 May 2010) New Revision: 17212 Modified: root/build/parent/trunk/pom.xml Log: [maven-release-plugin] prepare release richfaces-parent-2 Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-24 18:24:49 UTC (rev 17211) +++ root/build/parent/trunk/pom.xml 2010-05-24 18:29:46 UTC (rev 17212) @@ -15,14 +15,13 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>2</version> <name>RichFaces Parent</name> <parent> @@ -436,11 +435,11 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/trunk + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/build/parent/tags/r... </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/trunk + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/build/parent/tags/rich... </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces</url> + <url>http://fisheye.jboss.org/browse/richfaces/tags/richfaces-parent-2</url> </scm> </project>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17211 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-05-24 14:24:49 -0400 (Mon, 24 May 2010) New Revision: 17211 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java Log: RESOLVED - issue RF-8363: Functions support https://jira.jboss.org/browse/RF-8363 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-05-24 17:58:15 UTC (rev 17210) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibGeneratorVisitor.java 2010-05-24 18:24:49 UTC (rev 17211) @@ -241,7 +241,7 @@ functionElement.addElement("function-class").addText(model.getFunctionClass().toString()); functionElement.addElement("function-signature").addText(model.getSignature()); } - return false; + return null; } /**

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17210 - in root: core/trunk/impl/src/main/java/org/ajax4jsf/renderkit and 8 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-24 13:58:15 -0400 (Mon, 24 May 2010) New Revision: 17210 Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java Log: Support for "org.richfaces.queue.enabled" parameter Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -49,7 +49,7 @@ public static final String HANDLE_VIEW_EXPIRED_ON_CLIENT = "org.ajax4jsf.handleViewExpiredOnClient"; public static final String STD_CONTROLS_SKINNING_PARAM = "org.richfaces.ENABLE_CONTROL_SKINNING"; public static final String STD_CONTROLS_SKINNING_CLASSES_PARAM = "org.richfaces.ENABLE_CONTROL_SKINNING_CLASSES"; - public static final String[] GLOBAL_QUEUE_ENABLED = {"org.richfaces.queue.enabled"}; + public static final String[] QUEUE_ENABLED = {"org.richfaces.queue.enabled"}; private static final String INIT_PARAM_PREFIX = ContextInitParameters.class.getSimpleName() + ":"; private static final Object NULL = new Object() { @@ -80,14 +80,8 @@ return getBoolean(context, DATATABLE_USES_VIEW_LOCALE, false); } - /** - * Defines what the skinning level used - * - * @param context - * @return value of CONTROL_SKINNING_LEVEL parameter if present - */ - public static boolean isGlobalQueueEnabled(FacesContext context) { - return getBoolean(context, GLOBAL_QUEUE_ENABLED, true); + public static boolean isQueueEnabled(FacesContext context) { + return getBoolean(context, QUEUE_ENABLED, true); } /** Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java =================================================================== --- root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -32,15 +32,18 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; import javax.faces.FacesException; +import javax.faces.application.Application; import javax.faces.application.ViewHandler; import javax.faces.component.EditableValueHolder; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIForm; +import javax.faces.component.UIOutput; import javax.faces.component.UIParameter; import javax.faces.component.UIViewRoot; import javax.faces.component.ValueHolder; @@ -57,6 +60,7 @@ import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.util.HtmlDimensions; import org.richfaces.context.ComponentIdResolver; +import org.richfaces.context.RequestStateManager; /** * Util class for common render operations - render passthru html attributes, @@ -1135,6 +1139,80 @@ } } + private UIComponent findInstalledResource(FacesContext context, String libraryName, String resourceName, + String target) { + + List<UIComponent> resourceComponents = context.getViewRoot().getComponentResources(context, target); + for (UIComponent component : resourceComponents) { + Map<String, Object> attributes = component.getAttributes(); + + if (resourceName.equals(attributes.get("name"))) { + Object library = attributes.get("library"); + + if ((libraryName == null && library == null) || libraryName.equals(library)) { + return component; + } + } + } + + return null; + } + + public UIComponent findInstalledResource(FacesContext context, String libraryName, String resourceName) { + UIComponent component; + + component = findInstalledResource(context, libraryName, resourceName, "head"); + + if (component == null) { + component = findInstalledResource(context, libraryName, resourceName, "body"); + } + + if (component == null) { + component = findInstalledResource(context, libraryName, resourceName, "form"); + } + + return component; + } + + public void addResource(FacesContext context, String libraryName, String resourceName) { + addResource(context, libraryName, resourceName, null); + } + + public void addResource(FacesContext context, String libraryName, String resourceName, String targetParam) { + String resourceKey; + + if (libraryName != null && libraryName.length() != 0) { + resourceKey = libraryName + '/' + resourceName; + } else { + resourceKey = resourceName; + } + + Set<String> processedResources = RequestStateManager.getProcessedResources(context); + if (processedResources.contains(resourceKey)) { + return ; + } + + UIComponent resourceComponent = findInstalledResource(context, libraryName, resourceName); + if (resourceComponent == null) { + Application application = context.getApplication(); + resourceComponent = application.createComponent(UIOutput.COMPONENT_TYPE); + + String rendererType = application.getResourceHandler().getRendererTypeForResourceName(resourceName); + resourceComponent.setRendererType(rendererType); + + if (libraryName != null && libraryName.length() != 0) { + resourceComponent.getAttributes().put("library", libraryName); + } + + resourceComponent.getAttributes().put("name", resourceName); + + String target = (targetParam != null ? targetParam : "head"); + context.getViewRoot().addComponentResource(context, resourceComponent, target); + } + + processedResources.add(resourceKey); + } + /** * Common HTML elements and attributes names. * Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java (rev 0) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.context; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; + +/** + * @author Nick Belaevski + * + */ +public final class RequestStateManager { + + private static final String ATTRIBUTE_NAME_PREFIX = RequestStateManager.class.getName() + ":"; + + private enum Sets { + PROCESSED_RESOURCES("processedResources"); + + private final String attributeName; + + private Sets(String propertyName) { + this.attributeName = ATTRIBUTE_NAME_PREFIX + propertyName; + } + + void clear(FacesContext context) { + context.getAttributes().remove(attributeName); + } + + public Set<String> getValue(FacesContext context) { + Map<Object, Object> attributes = context.getAttributes(); + + Set<String> set = (Set<String>) attributes.get(attributeName); + if (set == null) { + set = new HashSet<String>(); + attributes.put(attributeName, set); + } + + return set; + } + }; + + private RequestStateManager() { + //only factory methods are allowed to be used + } + + static void clear(FacesContext context) { + if (context.getCurrentPhaseId() == PhaseId.RENDER_RESPONSE) { + RequestStateManager.Sets.PROCESSED_RESOURCES.clear(context); + } + } + + public static Set<String> getProcessedResources(FacesContext context) { + return Sets.PROCESSED_RESOURCES.getValue(context); + } +} Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java (rev 0) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.context; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * @author Nick Belaevski + * + */ +public class RequestStateManagerPhaseCleaner implements PhaseListener { + + /** + * + */ + private static final long serialVersionUID = -7736491845168435241L; + + public void afterPhase(PhaseEvent event) { + } + + public void beforePhase(PhaseEvent event) { + RequestStateManager.clear(event.getFacesContext()); + } + + public PhaseId getPhaseId() { + return PhaseId.ANY_PHASE; + } +} Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -24,6 +24,7 @@ import java.util.Map; import javax.el.ELContext; +import javax.faces.application.Application; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; import javax.faces.component.UIViewRoot; @@ -57,8 +58,6 @@ private static final String CLASSES_SKINNING; - private static final String STYLESHEET_RENDERER = "javax.faces.resource.Stylesheet"; - static { String skinningName = "skinning"; @@ -115,8 +114,10 @@ } private UIComponent createComponentResource(FacesContext context) { - UIComponent resourceComponent = context.getApplication().createComponent(UIOutput.COMPONENT_TYPE); - resourceComponent.setRendererType(STYLESHEET_RENDERER); + Application application = context.getApplication(); + UIComponent resourceComponent = application.createComponent(UIOutput.COMPONENT_TYPE); + resourceComponent.setRendererType( + application.getResourceHandler().getRendererTypeForResourceName(BOTH_SKINNING)); return resourceComponent; } @@ -133,9 +134,11 @@ assert viewRoot != null; - Map<String, Object> attributes = viewRoot.getAttributes(); - if (!Boolean.TRUE.equals(attributes.get(RESOURCES_PROCESSED_MARKER))) { - attributes.put(RESOURCES_PROCESSED_MARKER, Boolean.TRUE); + Map<String, Object> viewMap = viewRoot.getViewMap(); + + //TODO nick - is this check sufficient? + if (!Boolean.TRUE.equals(viewMap.get(RESOURCES_PROCESSED_MARKER))) { + viewMap.put(RESOURCES_PROCESSED_MARKER, Boolean.TRUE); UIComponent basic = createComponentResource(context); basic.setValueExpression("name", new SkinningResourceNameExpression()); Modified: root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml 2010-05-24 17:58:15 UTC (rev 17210) @@ -80,4 +80,8 @@ -->  + <lifecycle> + <phase-listener>org.richfaces.context.RequestStateManagerPhaseCleaner</phase-listener> + </lifecycle> + </faces-config> Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -48,8 +48,9 @@ renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT) @ResourceDependencies( - {@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js", target = "head") , @ResourceDependency(name = "richfaces.js", target = "head"), @ResourceDependency(name="richfaces-queue.js") + {@ResourceDependency(library = "javax.faces", name = "jsf.js"), + @ResourceDependency(name = "jquery.js", target = "head"), + @ResourceDependency(name = "richfaces.js", target = "head") } ) Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -48,7 +48,7 @@ * */ @ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-queue.js") }) + @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js")}) public abstract class AjaxCommandRendererBase extends RendererBase { private static final Logger LOG = RichfacesLogger.RENDERKIT.getLogger(); Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -21,6 +21,16 @@ package org.richfaces.renderkit.html; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.HandlersChain; import org.ajax4jsf.renderkit.RendererBase; @@ -30,23 +40,13 @@ import org.richfaces.component.AbstractAjaxStatus; import org.richfaces.component.util.HtmlUtil; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - /** * @author Nick Belaevski */ @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-queue.js")}) + @ResourceDependency(name = "richfaces.js")}) public class AjaxStatusRenderer extends RendererBase { private static final String START = "start"; Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -21,8 +21,6 @@ */ package org.richfaces.renderkit.html; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; @@ -34,6 +32,8 @@ import javax.faces.event.PreRemoveFromViewEvent; import javax.faces.render.Renderer; +import org.ajax4jsf.context.ContextInitParameters; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.QueueRegistry; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; @@ -41,11 +41,10 @@ /** * @author Nick Belaevski Base class for rendering Queue */ -@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-queue.js") }) -@ListenersFor( { @ListenerFor(systemEventClass = PostAddToViewEvent.class), - @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) }) +@ListenersFor({ + @ListenerFor(systemEventClass = PostAddToViewEvent.class), + @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) +}) public abstract class QueueRendererBase extends Renderer implements ComponentSystemEventListener { //TODO nick - handle ContextInitParameters.isGlobalQueueEnabled(FacesContext) @@ -54,6 +53,8 @@ protected static final String NAME_ATTRIBBUTE = "name"; protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger(); + private final RendererUtils utils = RendererUtils.getInstance(); + public void processEvent(ComponentSystemEvent event) throws AbortProcessingException { UIComponent comp = event.getComponent(); FacesContext context = FacesContext.getCurrentInstance(); @@ -63,6 +64,19 @@ if (event instanceof PostAddToViewEvent) { queueRegistry.addQueue(queueName, comp); + + //@ResourceDependency(library = "javax.faces", name = "jsf.js"), + //@ResourceDependency(name = "jquery.js"), + //@ResourceDependency(name = "richfaces.js"), + //@ResourceDependency(name = "richfaces-queue.js") + utils.addResource(context, "javax.faces", "jsf.js"); + utils.addResource(context, null, "jquery.js"); + utils.addResource(context, null, "richfaces.js"); + + if (ContextInitParameters.isQueueEnabled(context)) { + utils.addResource(context, null, "richfaces-queue.js"); + //TODO nick - make queue resource transient? + } } else if (event instanceof PreRemoveFromViewEvent) { queueRegistry.removeQueue(queueName); } Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -32,6 +32,7 @@ import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; +import org.ajax4jsf.context.ContextInitParameters; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; @@ -69,7 +70,7 @@ super.encodeEnd(context, component); QueueRegistry registry = QueueRegistry.getInstance(context); - if (registry != null && registry.hasQueuesToEncode()) { + if (ContextInitParameters.isQueueEnabled(context) && registry != null && registry.hasQueuesToEncode()) { ResponseWriter writer = context.getResponseWriter(); writer.startElement(HTML.SCRIPT_ELEM, component); Modified: root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java =================================================================== --- root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -51,7 +51,7 @@ @FacesBehaviorRenderer(rendererType = "org.richfaces.behavior.ComponentControlBehavior", renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT) @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-queue.js"), + @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "script/component-control.js") }) public class ComponentControlBehaviorRenderer extends ClientBehaviorRenderer { Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -46,7 +46,7 @@ @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-queue.js"), + @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "script/datascroller.js"), @ResourceDependency(name = "css/datascroller.ecss") Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -43,7 +43,7 @@ * */ @ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), - @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name="richfaces-queue.js"), @ResourceDependency(name = "toggler.js")}) + @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "toggler.js")}) public abstract class ToggleControlRendererBase extends RendererBase {

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17209 - root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-05-24 12:00:14 -0400 (Mon, 24 May 2010) New Revision: 17209 Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js Log: RF-8674 Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-24 15:09:22 UTC (rev 17208) +++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-24 16:00:14 UTC (rev 17209) @@ -84,7 +84,7 @@ normalPartStyle.width = width + "px"; normalPartStyle.display = "block"; if (scrollElement.clientWidth < scrollElement.scrollWidth - && scrollElement.clientHeight == scrollElement.offsetHeight) { + && scrollElement.scrollHeight == scrollElement.offsetHeight) { scrollElement.style.overflowX = "scroll"; } else { scrollElement.style.overflowX = "";

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17208 - root/build/parent/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2010-05-24 11:09:22 -0400 (Mon, 24 May 2010) New Revision: 17208 Modified: root/build/parent/trunk/pom.xml Log: https://jira.jboss.org/browse/RF-8670 Adjust to support options from jboss-parent. Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-24 14:03:02 UTC (rev 17207) +++ root/build/parent/trunk/pom.xml 2010-05-24 15:09:22 UTC (rev 17208) @@ -59,8 +59,9 @@ </issueManagement> <properties> - <project.reporting.outputEncoding>UTF-8 - </project.reporting.outputEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> +  + <maven.min.version>2.1.0</maven.min.version> </properties>  @@ -168,26 +169,6 @@  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.1.0</version> - </requireMavenVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>1.5</source> @@ -195,17 +176,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -378,8 +348,7 @@  <profile> <id>jsf-ri</id>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r17207 - in root/ui/core/trunk/api/src: main/java/org/richfaces/renderkit/html and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-05-24 10:03:02 -0400 (Mon, 24 May 2010) New Revision: 17207 Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/QueueRegistry.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AttachQueueRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java root/ui/core/trunk/api/src/test/java/org/richfaces/component/QueueRendererTest.java root/ui/core/trunk/api/src/test/resources/org/richfaces/component/queue.xhtml Log: Queue redesign & fixes Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/component/QueueRegistry.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/component/QueueRegistry.java 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/component/QueueRegistry.java 2010-05-24 14:03:02 UTC (rev 17207) @@ -60,7 +60,7 @@ return registry; } - public void registerQueue(String clientName, UIComponent component) { + public void addQueue(String clientName, UIComponent component) { if (!containsQueue(clientName)) { queuesData.put(clientName, component); } else { @@ -68,10 +68,8 @@ } } - public void removeQueue(String clientName) { - if (!containsQueue(clientName)) { - queuesData.remove(clientName); - } + public UIComponent removeQueue(String clientName) { + return queuesData.remove(clientName); } public boolean containsQueue(String name) { Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AttachQueueRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AttachQueueRenderer.java 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AttachQueueRenderer.java 2010-05-24 14:03:02 UTC (rev 17207) @@ -22,6 +22,7 @@ package org.richfaces.renderkit.html; import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; import org.richfaces.cdk.annotations.JsfRenderer; @@ -32,28 +33,8 @@ public class AttachQueueRenderer extends QueueRendererBase { @Override - protected String getQueueName(UIComponent comp) { - return comp.getClientId(); + protected String getQueueName(FacesContext context, UIComponent comp) { + return comp.getClientId(context); } - @Override - protected String findAndSetQueueName(UIComponent comp) { - String name = null; - if (comp.getAttributes().get(NAME_ATTRIBBUTE) != null) { - name = comp.getAttributes().get(NAME_ATTRIBBUTE).toString(); - comp.getAttributes().put(QUEUE_ID_ATTRIBBUTE, name); - name = getQueueName(comp); - } else { - String foundedQueueId = findParentQueueId(comp); - if (foundedQueueId != null) { - comp.getAttributes().put(QUEUE_ID_ATTRIBBUTE, foundedQueueId); - name = getQueueName(comp); - } else { - LOGGER - .warn("Global and form queue for this a4j:attach component can not be found" + getQueueName(comp)); - return null; - } - } - return name; - } } \ No newline at end of file Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-24 14:03:02 UTC (rev 17207) @@ -22,9 +22,10 @@ package org.richfaces.renderkit.html; import javax.faces.component.UIComponent; +import javax.faces.component.UIForm; import javax.faces.context.FacesContext; -import org.ajax4jsf.context.ContextInitParameters; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.AbstractQueue; @@ -34,29 +35,21 @@ @JsfRenderer(type = "org.richfaces.QueueRenderer", family = "org.richfaces.Queue") public class QueueRenderer extends QueueRendererBase { - @Override - protected String findAndSetQueueName(UIComponent comp) { - String name = null; - if (comp.getAttributes().get(NAME_ATTRIBBUTE) != null) { - name = comp.getAttributes().get(NAME_ATTRIBBUTE).toString(); - } else { - UIComponent parentForm = findParentForm(comp); - if (parentForm != null) { - name = parentForm.getClientId(); + private final RendererUtils utils = RendererUtils.getInstance(); + + protected String getQueueName(FacesContext context, UIComponent comp) { + String nameAttributeValue = (String) comp.getAttributes().get(NAME_ATTRIBBUTE); + + if (nameAttributeValue == null || nameAttributeValue.length() == 0) { + UIForm form = utils.getNestingForm(context, comp); + if (form != null) { + nameAttributeValue = form.getClientId(context); } else { - name = AbstractQueue.GLOBAL_QUEUE_NAME; - if (!ContextInitParameters.isGlobalQueueEnabled(FacesContext.getCurrentInstance())) { - LOGGER.warn("Global queue is disabled by you are using unnamed queue, so new global queue will be created with defined parameters"); - } + nameAttributeValue = AbstractQueue.GLOBAL_QUEUE_NAME; } - comp.getAttributes().put(NAME_ATTRIBBUTE, name); } - return name; - } - @Override - protected String getQueueName(UIComponent comp) { - // TODO Auto-generated method stub - return comp.getAttributes().get(NAME_ATTRIBBUTE).toString(); + return nameAttributeValue; } + } \ No newline at end of file Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 14:03:02 UTC (rev 17207) @@ -24,7 +24,6 @@ import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; -import javax.faces.component.UIForm; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; import javax.faces.event.ComponentSystemEvent; @@ -35,8 +34,6 @@ import javax.faces.event.PreRemoveFromViewEvent; import javax.faces.render.Renderer; -import org.ajax4jsf.context.ContextInitParameters; -import org.richfaces.component.AbstractQueue; import org.richfaces.component.QueueRegistry; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; @@ -44,7 +41,6 @@ /** * @author Nick Belaevski Base class for rendering Queue */ -// @JsfRenderer @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-queue.js") }) @@ -52,6 +48,8 @@ @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) }) public abstract class QueueRendererBase extends Renderer implements ComponentSystemEventListener { + //TODO nick - handle ContextInitParameters.isGlobalQueueEnabled(FacesContext) + protected static final String QUEUE_ID_ATTRIBBUTE = "queueId"; protected static final String NAME_ATTRIBBUTE = "name"; protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger(); @@ -60,39 +58,16 @@ UIComponent comp = event.getComponent(); FacesContext context = FacesContext.getCurrentInstance(); + String queueName = getQueueName(context, comp); + QueueRegistry queueRegistry = QueueRegistry.getInstance(context); + if (event instanceof PostAddToViewEvent) { - String name = findAndSetQueueName(comp); - if (name != null) { - QueueRegistry.getInstance(context).registerQueue(name, comp); - } + queueRegistry.addQueue(queueName, comp); } else if (event instanceof PreRemoveFromViewEvent) { - QueueRegistry.getInstance(context).removeQueue(getQueueName(comp)); + queueRegistry.removeQueue(queueName); } } - protected abstract String findAndSetQueueName(UIComponent comp); + protected abstract String getQueueName(FacesContext context, UIComponent comp); - protected abstract String getQueueName(UIComponent comp); - - protected String findParentQueueId(UIComponent comp) { - UIComponent parentForm = findParentForm(comp); - for (UIComponent c : parentForm.getChildren()) { - if (c instanceof AbstractQueue) { - return parentForm.getClientId(); - } - } - if (ContextInitParameters.isGlobalQueueEnabled(FacesContext.getCurrentInstance())) { - return AbstractQueue.GLOBAL_QUEUE_NAME; - } - return null; - } - - protected UIComponent findParentForm(UIComponent comp) { - UIComponent component = comp.getParent(); - while (component != null && !(component instanceof UIForm)) { - component = component.getParent(); - } - - return component; - } } \ No newline at end of file Modified: root/ui/core/trunk/api/src/test/java/org/richfaces/component/QueueRendererTest.java =================================================================== --- root/ui/core/trunk/api/src/test/java/org/richfaces/component/QueueRendererTest.java 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/test/java/org/richfaces/component/QueueRendererTest.java 2010-05-24 14:03:02 UTC (rev 17207) @@ -46,10 +46,10 @@ private static final String EXPECTED_QUEUE_SCRIPT = "RichFaces.queue.setQueueOptions({" + "'first': {'requestDelay': 400, 'timeout': 100, 'ignoreDupResponses': true}," + "'form': {'requestDelay': 400}," + - "'form:firstAttach': {'timeout': 300, 'queueId': 'form', 'requestGroupingId': 'request'}," + + "'form:firstAttach': {'timeout': 300, 'requestGroupingId': 'request'}," + "'second': {'requestDelay': 400, 'timeout': 100, 'ignoreDupResponses': true}," + - "'form:linkAttach': {'timeout': 500, 'queueId': 'second'}," + - "'form:secondAttach': {'queueId': 'form'}" + + "'form:linkAttach': {'timeout': 500}," + + "'form:secondAttach': {}" + "});"; protected HtmlPage page; Modified: root/ui/core/trunk/api/src/test/resources/org/richfaces/component/queue.xhtml =================================================================== --- root/ui/core/trunk/api/src/test/resources/org/richfaces/component/queue.xhtml 2010-05-24 13:58:27 UTC (rev 17206) +++ root/ui/core/trunk/api/src/test/resources/org/richfaces/component/queue.xhtml 2010-05-24 14:03:02 UTC (rev 17207) @@ -5,12 +5,6 @@ <h:head> <title>Test queue page</title> - - <h:outputScript name="jsf.js" library="javax.faces" /> - <h:outputScript name="jquery.js" /> - <h:outputScript name="richfaces.js" /> - <h:outputScript name="richfaces-queue.js" /> - </h:head> <h:body> <a4j:queue name="first" ignoreDupResponses="true" timeout="100" requestDelay="400"/>

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2010