richfaces-svn-commits July 2007

richfaces-svn-commits@lists.jboss.org

1 participants
535 discussions

JBoss Rich Faces SVN: r1434 - in branches/refactor1/framework: impl and 1 other directories.

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

Author: nbelaevski Date: 2007-07-02 11:34:42 -0400 (Mon, 02 Jul 2007) New Revision: 1434 Modified: branches/refactor1/framework/api/ branches/refactor1/framework/impl/ branches/refactor1/framework/test/ Log: service files & folders svn:ignored Property changes on: branches/refactor1/framework/api ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: branches/refactor1/framework/impl ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: branches/refactor1/framework/test ___________________________________________________________________ Name: svn:ignore + target

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r1433 - in branches/refactor1/ui: dataFilterSlider and 17 other directories.

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

Author: nbelaevski Date: 2007-07-02 10:59:35 -0400 (Mon, 02 Jul 2007) New Revision: 1433 Added: branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java Modified: branches/refactor1/ui/core/ branches/refactor1/ui/dataFilterSlider/pom.xml branches/refactor1/ui/dataTable/pom.xml branches/refactor1/ui/datascroller/pom.xml branches/refactor1/ui/drag-drop/pom.xml branches/refactor1/ui/dropdown-menu/pom.xml branches/refactor1/ui/menu-components/pom.xml branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx branches/refactor1/ui/paint2D/pom.xml branches/refactor1/ui/panel/pom.xml branches/refactor1/ui/simpleTogglePanel/pom.xml branches/refactor1/ui/spacer/pom.xml branches/refactor1/ui/suggestionbox/pom.xml branches/refactor1/ui/tabPanel/pom.xml branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java branches/refactor1/ui/togglePanel/pom.xml branches/refactor1/ui/toolBar/pom.xml Log: richfaces.ui made compilable Property changes on: branches/refactor1/ui/core ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Modified: branches/refactor1/ui/dataFilterSlider/pom.xml =================================================================== --- branches/refactor1/ui/dataFilterSlider/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dataFilterSlider/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,69 +1,51 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataFilterSlider</artifactId> - <name>Data Filter Slider</name> - <build> - <plugins> - - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dataFilterSlider</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <releases /> - <snapshots /> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>https://maven2-repository.dev.java.net/nonav/repository</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <releases /> - <snapshots /> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>https://maven2-repository.dev.java.net/nonav/repository</url> - </pluginRepository> - </pluginRepositories> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.parent.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataFilterSlider</artifactId> + <name>Data Filter Slider</name> + <build> + <plugins> + + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dataFilterSlider</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/dataTable/pom.xml =================================================================== --- branches/refactor1/ui/dataTable/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dataTable/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,59 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <name>Extended data table and lists</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dataTable</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - - <pluginRepositories> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven2-snapshots.ajax4jsf.org</id> - <name>Ajax4jsf Repository for Maven Snapshots</name> - <url>https://ajax4jsf.dev.java.net/nonav/snapshots</url> - </pluginRepository> - </pluginRepositories> - <dependencies> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <name>Extended data table and lists</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dataTable</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/datascroller/pom.xml =================================================================== --- branches/refactor1/ui/datascroller/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/datascroller/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>datascroller</artifactId> - <name>Data Scroller</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>datascroller</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>datascroller</artifactId> + <name>Data Scroller</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>datascroller</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/drag-drop/pom.xml =================================================================== --- branches/refactor1/ui/drag-drop/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/drag-drop/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,55 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>drag-drop</artifactId> - <name>Drag and Drop</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dnd</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>drag-drop</artifactId> + <name>Drag and Drop</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dnd</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/dropdown-menu/pom.xml =================================================================== --- branches/refactor1/ui/dropdown-menu/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dropdown-menu/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,55 +1,55 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dropdown-menu</artifactId> - <name>Drop down menu</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dropdown-menu</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dropdown-menu</artifactId> + <name>Drop down menu</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dropdown-menu</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/menu-components/pom.xml =================================================================== --- branches/refactor1/ui/menu-components/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <name>Menu components</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>menu-components</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <name>Menu components</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>menu-components</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java =================================================================== --- branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -29,7 +29,6 @@ import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.util.command.CommandScriptBuilder; import org.richfaces.component.MenuComponent; import org.richfaces.component.UIMenuGroup; import org.richfaces.component.UIMenuItem; Modified: branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -24,7 +24,6 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.command.CommandScriptBuilder; import org.richfaces.component.MenuComponent; import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; @@ -110,17 +109,26 @@ scriptValue.append(AjaxRendererUtils.buildOnClick( menuItem, context).toString()); } else if (mode.equalsIgnoreCase(MenuComponent.MODE_SERVER)) { - CommandScriptBuilder builder = new CommandScriptBuilder(menuItem); - builder.setCheckActionAndListener(false); - Object target = menuItem.getAttributes().get("target"); - if (null != target) { - builder.setTarget((String) target); - } - builder.setUseOriginalOnclick(true); - builder.addCodeBefore("Event.stop(event || window.event);"); - String id = menuItem.getClientId(context); - builder.addParameter(id + ":hidden", id); - scriptValue.append(builder.toString()); + String id = menuItem.getClientId(context); + scriptValue.append('{'); + scriptValue.append("var form = A4J.findForm(this);"); + scriptValue.append("var params = new Object();"); + scriptValue.append("params['"); + scriptValue.append(id + ":hidden"); + scriptValue.append("'] = "); + scriptValue.append(id); + scriptValue.append(';'); + scriptValue.append("Richfaces.jsFormSubmit('"); + scriptValue.append(id); + scriptValue.append("', "); + scriptValue.append("form.id, "); + Object target = menuItem.getAttributes().get("target"); + if (null != target) { + scriptValue.append("'"+(String) target+"', "); + } else { + scriptValue.append("'', "); + } + scriptValue.append("params);}; return false;"); } else { scriptValue.append( getStringAttributeOrEmptyString(menuItem, "onclick")); Modified: branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-02 14:59:35 UTC (rev 1433) @@ -14,7 +14,8 @@ <h:scripts> new org.ajax4jsf.framework.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), - new org.ajax4jsf.framework.util.command.CommandScript() + /org/richfaces/renderkit/html/scripts/utils.js, + /org/ajax4jsf/renderkit/html/scripts/form.js </h:scripts> <f:call name="initializeResources" /> Modified: branches/refactor1/ui/paint2D/pom.xml =================================================================== --- branches/refactor1/ui/paint2D/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/paint2D/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,58 +1,51 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>paint2D</artifactId> - <name>Paint java 2D</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>paint2D</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>paint2D</artifactId> + <name>Paint java 2D</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>paint2D</shortName> + </taglib> + </library> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: branches/refactor1/ui/panel/pom.xml =================================================================== --- branches/refactor1/ui/panel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/panel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,51 +1,51 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>panel</artifactId> - <name>Panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>panel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>panel</artifactId> + <name>Panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>panel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>simpleTogglePanel</artifactId> - <name>Toggle panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>simpleTogglePanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>simpleTogglePanel</artifactId> + <name>Toggle panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>simpleTogglePanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/spacer/pom.xml =================================================================== --- branches/refactor1/ui/spacer/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/spacer/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>spacer</artifactId> - <name>Spacer</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>spacer</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>spacer</artifactId> + <name>Spacer</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>spacer</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/suggestionbox/pom.xml =================================================================== --- branches/refactor1/ui/suggestionbox/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/suggestionbox/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>suggestionbox</artifactId> - <name>Suggestion box</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>suggestionbox</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>suggestionbox</artifactId> + <name>Suggestion box</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>suggestionbox</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/tabPanel/pom.xml =================================================================== --- branches/refactor1/ui/tabPanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/tabPanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>tabPanel</artifactId> - <name>Tab panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>tabPanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>tabPanel</artifactId> + <name>Tab panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>tabPanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java =================================================================== --- branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -25,7 +25,6 @@ import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.richfaces.model.TabModel; import javax.faces.FacesException; import javax.faces.component.ActionSource; @@ -42,7 +41,7 @@ * @version $Revision: 1.12 $ $Date: 2007/02/21 20:35:05 $ */ //TODO remove excess interfaces -public abstract class UITab extends AjaxActionComponent implements TabModel, AjaxComponent, AjaxSource, ActionSource { +public abstract class UITab extends AjaxActionComponent implements AjaxComponent, AjaxSource, ActionSource { public static final String COMPONENT_TYPE = "org.richfaces.Tab"; Modified: branches/refactor1/ui/togglePanel/pom.xml =================================================================== --- branches/refactor1/ui/togglePanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/togglePanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>togglePanel</artifactId> - <name>Toggle panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>togglePanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>togglePanel</artifactId> + <name>Toggle panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>togglePanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/toolBar/pom.xml =================================================================== --- branches/refactor1/ui/toolBar/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/toolBar/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,50 @@ -<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>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>toolBar</artifactId> - <name>Tool bar</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>toolBar</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>ui</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>toolBar</artifactId> + <name>Tool bar</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>toolBar</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Added: branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java =================================================================== --- branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java (rev 0) +++ branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -0,0 +1,140 @@ +/** + * License Agreement. + * + * JBoss RichFaces 3.0 - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.component; + +import java.io.IOException; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.ajax.repeat.DataVisitor; +import org.ajax4jsf.ajax.repeat.Range; + +/** + * @author Nick - mailto:nbelaevski@exadel.com created 08.01.2007 + * + */ +public class CacheableTreeDataModel extends TreeDataModel { + + private final class Visitor implements DataVisitor, LastElementAware { + private final DataVisitor visitor; + + private Visitor(DataVisitor visitor) { + this.visitor = visitor; + } + + public void process(FacesContext context, Object rowKey, Object argument) + throws IOException { + TreeRowKey treeRowKey = (TreeRowKey) rowKey; + treeDataModel.setRowKey(treeRowKey); + locateTreeNode(treeRowKey, true).setData(treeDataModel.getRowData()); + + if (visitor != null) { + visitor.process(context, rowKey, argument); + } + } + + public void resetLastElement() { + if (visitor instanceof LastElementAware) { + ((LastElementAware) visitor).resetLastElement(); + + } + } + + public void setLastElement() { + if (visitor instanceof LastElementAware) { + ((LastElementAware) visitor).setLastElement(); + + } + } + } + + private TreeDataModel treeDataModel; + + public boolean isLeaf() { + TreeRowKey rowKey = (TreeRowKey) getRowKey(); + TreeNode treeNode = locateTreeNode(rowKey); + if (treeNode != null && !treeNode.isLeaf()) { + return false; + } + + treeNode = treeDataModel.locateTreeNode(rowKey); + if (treeNode != null) { + return treeNode.isLeaf(); + } + + return false; + } + + public CacheableTreeDataModel(TreeDataModel model) { + super(); + setWrappedData(new TreeNodeImpl()); + setTreeDataModel(model); + } + + public void walkModel(FacesContext context, DataVisitor visitor, + Range range, Object key, Object argument, boolean last) + throws IOException { + treeDataModel.walkModel(context, new Visitor(visitor), range, key, + argument, last); + } + + public void setTreeDataModel(TreeDataModel treeDataModel) { + this.treeDataModel = treeDataModel; + } + + public TreeDataModel getTreeDataModel() { + return treeDataModel; + } + + public void walk(FacesContext context, final DataVisitor dataVisitor, + Range range, Object rowKey, Object argument, boolean last) + throws IOException { + + TreeNode cachedTreeNode = locateTreeNode((TreeRowKey) rowKey); + TreeNode treeNode = treeDataModel.locateTreeNode((TreeRowKey) rowKey); + + if (treeNode != null) { + if (cachedTreeNode == null || (cachedTreeNode.isLeaf() && !treeNode.isLeaf())) { + //fill cache + treeDataModel.walk(context, new Visitor(dataVisitor), range, + rowKey, argument, last); + } else { + super.walk(context, dataVisitor, range, rowKey, argument, last); + } + } + } + + public void setRowData(Object object) { + (locateTreeNode((TreeRowKey)getRowKey())).setData(object); + } + + public boolean isTransient() { + return true; + } + + public void setTransient(boolean newTransientValue) { + if (!newTransientValue) { + throw new IllegalArgumentException( + "ReplaceableTreeDataModel shouldn't be transient!"); + } + } +}

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r1432 - in branches/refactor1/cdk: maven-archetype-jsf-component and 3 other directories.

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

Author: nbelaevski Date: 2007-07-02 10:13:05 -0400 (Mon, 02 Jul 2007) New Revision: 1432 Modified: branches/refactor1/cdk/generator/ branches/refactor1/cdk/maven-archetype-jsf-component/ branches/refactor1/cdk/maven-archetype-jsfwebapp/ branches/refactor1/cdk/maven-cdk-plugin/ branches/refactor1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java Log: - GenerateMojo.java setting up ContextCL - Service files svn:ignored Property changes on: branches/refactor1/cdk/generator ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: branches/refactor1/cdk/maven-archetype-jsf-component ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: branches/refactor1/cdk/maven-archetype-jsfwebapp ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: branches/refactor1/cdk/maven-cdk-plugin ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Modified: branches/refactor1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2007-07-02 11:02:39 UTC (rev 1431) +++ branches/refactor1/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/GenerateMojo.java 2007-07-02 14:13:05 UTC (rev 1432) @@ -1,292 +1,295 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.builder.mojo; - -import java.io.File; -import java.io.FilenameFilter; - -import org.ajax4jsf.builder.config.BuilderConfig; -import org.ajax4jsf.builder.config.ParsingException; -import org.ajax4jsf.builder.generator.ComponentGenerator; -import org.ajax4jsf.builder.generator.ConverterGenerator; -import org.ajax4jsf.builder.generator.ConverterTagGenerator; -import org.ajax4jsf.builder.generator.FaceletsTaglibGenerator; -import org.ajax4jsf.builder.generator.FacesConfigGenerator; -import org.ajax4jsf.builder.generator.GeneratorException; -import org.ajax4jsf.builder.generator.JSFGeneratorConfiguration; -import org.ajax4jsf.builder.generator.ListenerGenerator; -import org.ajax4jsf.builder.generator.RenderKitBean; -import org.ajax4jsf.builder.generator.RendererGenerator; -import org.ajax4jsf.builder.generator.ResourcesConfigGenerator; -import org.ajax4jsf.builder.generator.ComponentTagGenerator; -import org.ajax4jsf.builder.generator.TagHandlerGenerator; -import org.ajax4jsf.builder.generator.TaglibGenerator; -import org.ajax4jsf.builder.generator.ValidatorGenerator; -import org.ajax4jsf.builder.generator.ValidatorTagGenerator; -import org.ajax4jsf.builder.maven.MavenLogger; -import org.ajax4jsf.builder.velocity.BuilderContext; -import org.apache.maven.model.Resource; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; -import org.apache.velocity.Template; -import org.apache.velocity.exception.ParseErrorException; -import org.apache.velocity.exception.ResourceNotFoundException; - -/** - * This plugin geterate JSF components and renderers source code, as well as - * configuration files. - * - * @author shura - * @goal generate - * @requiresDependencyResolution compile - * @phase generate-sources - * @execute phase="compile" - */ -public class GenerateMojo extends AbstractCDKMojo implements - JSFGeneratorConfiguration { - - /** - * Project executed by first compile lifecycle. - * - * @parameter expression="${executedProject}" - * @readonly - */ - protected MavenProject executedProject; - - /* - * (non-Javadoc) - * - * @see org.apache.maven.plugin.Mojo#execute() - */ - public void execute() throws MojoExecutionException, MojoFailureException { - getLog().debug("GenerateMojo components"); - if (null != executedProject) { - Taglib taglib = checkLibraryConfig(); - // compile goal executed - try { - // Parse config files. - ClassLoader generatiorLoader = createProjectClassLoader(executedProject); - BuilderConfig config = createConfig(generatiorLoader); - MavenLogger mavenLogger = new MavenLogger(getLog()); - // TODO - parse sources by qdox for JavaDoc comments ? - // GenerateMojo components. - ComponentGenerator compGenerator = new ComponentGenerator(this, - mavenLogger); - compGenerator.createFiles(config); - // GenerateMojo validators - ValidatorGenerator validatorGenerator = new ValidatorGenerator(this, mavenLogger); - validatorGenerator.createFiles(config); - // GenerateMojo converters - ConverterGenerator converterGenerator = new ConverterGenerator(this, mavenLogger); - converterGenerator.createFiles(config); - // GenerateMojo renderers - RendererGenerator rendererGenerator = new RendererGenerator( - this, mavenLogger); - rendererGenerator.setSrcDir(templatesDirectory); - rendererGenerator.createFiles(config); - // GenerateMojo component test -/* - ComponentTestGenerator componentTestGenerator = new ComponentTestGenerator(this, mavenLogger); - componentTestGenerator.setDestDir(outputTestsDirectory); - componentTestGenerator.createFiles(config); -*/ - // GenerateMojo tags - ComponentTagGenerator componentTagGenerator = new ComponentTagGenerator(this, mavenLogger); - componentTagGenerator.createFiles(config); - -// GenerateMojo tags for validators - ValidatorTagGenerator validatorTagGenerator = new ValidatorTagGenerator(this, mavenLogger); - validatorTagGenerator.createFiles(config); - -// GenerateMojo tags for converters - ConverterTagGenerator converterTagGenerator = new ConverterTagGenerator(this, mavenLogger); - converterTagGenerator.createFiles(config); - - // GenerateMojo tag test -/* - TagTestGenerator tagTestGenerator = new TagTestGenerator(this, mavenLogger); - tagTestGenerator.setDestDir(outputTestsDirectory); - tagTestGenerator.createFiles(config); -*/ - // GenerateMojo tag handlers - TagHandlerGenerator tagHandlerGenerator = new TagHandlerGenerator( - this, mavenLogger); - tagHandlerGenerator.createFiles(config); - //Generate listeners - ListenerGenerator listenerGenerator = new ListenerGenerator(this, mavenLogger); - listenerGenerator.createFiles(config); - - JSFGeneratorConfiguration resourcesConfiguration = new JSFGeneratorConfiguration() { - - public ClassLoader getClassLoader() { - return createProjectClassLoader(executedProject); - } - - public File getDestDir() { - return outputResourcesDirectory; - } - - public String getKey() { - return key; - } - - public Template getTemplate(String name) throws GeneratorException { - return GenerateMojo.this.getTemplate(name); - } - - public String getTemplatesPath() { - return GenerateMojo.this.getTemplatesPath(); - } - - }; - // GenerateMojo faces-config - FacesConfigGenerator configGenerator = new FacesConfigGenerator( - resourcesConfiguration, mavenLogger); - configGenerator.setInclude(facesConfigInclude); - configGenerator.setFacesconfig(new File( - outputResourcesDirectory, "META-INF/faces-config.xml")); - RenderKitBean renderKitBean = configGenerator.createRenderKit(); - renderKitBean.setRenderkitid("HTML_BASIC"); - configGenerator.createFiles(config); - // GenerateMojo JSP taglib - if (null != taglib) { - TaglibGenerator taglibGenerator = new TaglibGenerator( - resourcesConfiguration, mavenLogger); - taglibGenerator.setUri(taglib.getUri()); - taglibGenerator.setShortname(taglib.getShortName()); - taglibGenerator.setListenerclass(taglib.getListenerClass()); - taglibGenerator.setDisplayname(taglib.getDisplayName()); - taglibGenerator.setListenerclass(taglib.getListenerClass()); - taglibGenerator.setValidatorclass(taglib.getValidatorClass()); - taglibGenerator.setTlibversion(taglib.getTlibVersion()); - taglibGenerator.setJspversion(taglib.getJspVersion()); - taglibGenerator.setInclude(taglibInclude); - taglibGenerator.setTaglib(new File( - outputResourcesDirectory, "META-INF/"+taglib.getShortName() - + ".tld")); - taglibGenerator.createFiles(config); - // GenerateMojo Facelets taglib - FaceletsTaglibGenerator faceletsTaglibGenerator = new FaceletsTaglibGenerator( - resourcesConfiguration, mavenLogger); - faceletsTaglibGenerator.setUri(taglib.getUri()); - faceletsTaglibGenerator.setShortname(taglib.getShortName()); - faceletsTaglibGenerator.setInclude(taglibInclude); - faceletsTaglibGenerator.setTaglib(new File( - outputResourcesDirectory, "META-INF/"+taglib.getShortName() - + ".taglib.xml")); - faceletsTaglibGenerator.createFiles(config); - } - - // Generate resources configuration file resources-config.xml - // for all images/scripts/css... - ResourcesConfigGenerator resourcesConfigGenerator = new ResourcesConfigGenerator(resourcesConfiguration, mavenLogger); - resourcesConfigGenerator.setInclude(resourcesInclude); - resourcesConfigGenerator.setTemplates(templatesDirectory); - resourcesConfigGenerator.setResourcesConfig(new File( - outputResourcesDirectory, "META-INF/resources-config.xml")); - resourcesConfigGenerator.createFiles(config); - - // Add generated sources and resources to project - project.addCompileSourceRoot(outputJavaDirectory.getPath()); -// project.addCompileSourceRoot(outputTestsDirectory.getPath()); - - Resource resource = new Resource(); - resource.setDirectory(outputResourcesDirectory.getPath()); -// resource.setTargetPath("META-INF"); - project.addResource(resource); - } catch (Exception e) { - getLog().error("Error on generate component", e); - throw new MojoExecutionException( - "Error in component generation", e); - } - } - - } - - protected BuilderConfig createConfig(ClassLoader generatiorLoader) - throws ParsingException { - BuilderConfig builderConfig = new BuilderConfig(generatiorLoader, - new MavenLogger(getLog())); - // Get all *.xml config files - FilenameFilter filter = new FilenameFilter() { - - public boolean accept(File dir, String name) { - - return name.toLowerCase().endsWith(".xml"); - } - - }; - File[] files = componentConfigDirectory.listFiles(filter); - if (null == files) { - throw new ParsingException("No config files found"); - } - for (int i = 0; i < files.length; i++) { - builderConfig.parseConfig(files[i]); - } - builderConfig.checkComopnentProperties(); - return builderConfig; - } - - public File getDestDir() { - // TODO Auto-generated method stub - return outputJavaDirectory; - } - - public String getKey() { - // TODO Auto-generated method stub - return key; - } - - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getClassLoader() - */ - public ClassLoader getClassLoader() { - return createProjectClassLoader(executedProject); - } - - /* (non-Javadoc) - * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getTemplate(java.lang.String) - */ - public Template getTemplate(String name) throws GeneratorException { - // TODO Auto-generated method stub - try { - return this.velocity.getEngine().getTemplate(name); - } catch (ResourceNotFoundException e) { - throw new GeneratorException(e.getLocalizedMessage()); - } catch (ParseErrorException e) { - throw new GeneratorException(e.getLocalizedMessage()); - } catch (Exception e) { - throw new GeneratorException(e.getLocalizedMessage()); - } - } - - /* (non-Javadoc) - * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getTemplatesPath() - */ - public String getTemplatesPath() { - return Library.JSF12.equals(library.getJsfVersion())?BuilderContext.TEMPLATES12_PATH:BuilderContext.TEMPLATES_PATH; - } - -} +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.builder.mojo; + +import java.io.File; +import java.io.FilenameFilter; + +import org.ajax4jsf.builder.config.BuilderConfig; +import org.ajax4jsf.builder.config.ParsingException; +import org.ajax4jsf.builder.generator.ComponentGenerator; +import org.ajax4jsf.builder.generator.ConverterGenerator; +import org.ajax4jsf.builder.generator.ConverterTagGenerator; +import org.ajax4jsf.builder.generator.FaceletsTaglibGenerator; +import org.ajax4jsf.builder.generator.FacesConfigGenerator; +import org.ajax4jsf.builder.generator.GeneratorException; +import org.ajax4jsf.builder.generator.JSFGeneratorConfiguration; +import org.ajax4jsf.builder.generator.ListenerGenerator; +import org.ajax4jsf.builder.generator.RenderKitBean; +import org.ajax4jsf.builder.generator.RendererGenerator; +import org.ajax4jsf.builder.generator.ResourcesConfigGenerator; +import org.ajax4jsf.builder.generator.ComponentTagGenerator; +import org.ajax4jsf.builder.generator.TagHandlerGenerator; +import org.ajax4jsf.builder.generator.TaglibGenerator; +import org.ajax4jsf.builder.generator.ValidatorGenerator; +import org.ajax4jsf.builder.generator.ValidatorTagGenerator; +import org.ajax4jsf.builder.maven.MavenLogger; +import org.ajax4jsf.builder.velocity.BuilderContext; +import org.apache.maven.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; +import org.apache.velocity.Template; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; + +/** + * This plugin geterate JSF components and renderers source code, as well as + * configuration files. + * + * @author shura + * @goal generate + * @requiresDependencyResolution compile + * @phase generate-sources + * @execute phase="compile" + */ +public class GenerateMojo extends AbstractCDKMojo implements + JSFGeneratorConfiguration { + + /** + * Project executed by first compile lifecycle. + * + * @parameter expression="${executedProject}" + * @readonly + */ + protected MavenProject executedProject; + + /* + * (non-Javadoc) + * + * @see org.apache.maven.plugin.Mojo#execute() + */ + public void execute() throws MojoExecutionException, MojoFailureException { + getLog().debug("GenerateMojo components"); + if (null != executedProject) { + Taglib taglib = checkLibraryConfig(); + ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); + // compile goal executed + try { + // Parse config files. + ClassLoader generatiorLoader = createProjectClassLoader(executedProject); + Thread.currentThread().setContextClassLoader(generatiorLoader); + BuilderConfig config = createConfig(generatiorLoader); + MavenLogger mavenLogger = new MavenLogger(getLog()); + // TODO - parse sources by qdox for JavaDoc comments ? + // GenerateMojo components. + ComponentGenerator compGenerator = new ComponentGenerator(this, + mavenLogger); + compGenerator.createFiles(config); + // GenerateMojo validators + ValidatorGenerator validatorGenerator = new ValidatorGenerator(this, mavenLogger); + validatorGenerator.createFiles(config); + // GenerateMojo converters + ConverterGenerator converterGenerator = new ConverterGenerator(this, mavenLogger); + converterGenerator.createFiles(config); + // GenerateMojo renderers + RendererGenerator rendererGenerator = new RendererGenerator( + this, mavenLogger); + rendererGenerator.setSrcDir(templatesDirectory); + rendererGenerator.createFiles(config); + // GenerateMojo component test +/* + ComponentTestGenerator componentTestGenerator = new ComponentTestGenerator(this, mavenLogger); + componentTestGenerator.setDestDir(outputTestsDirectory); + componentTestGenerator.createFiles(config); +*/ + // GenerateMojo tags + ComponentTagGenerator componentTagGenerator = new ComponentTagGenerator(this, mavenLogger); + componentTagGenerator.createFiles(config); + +// GenerateMojo tags for validators + ValidatorTagGenerator validatorTagGenerator = new ValidatorTagGenerator(this, mavenLogger); + validatorTagGenerator.createFiles(config); + +// GenerateMojo tags for converters + ConverterTagGenerator converterTagGenerator = new ConverterTagGenerator(this, mavenLogger); + converterTagGenerator.createFiles(config); + + // GenerateMojo tag test +/* + TagTestGenerator tagTestGenerator = new TagTestGenerator(this, mavenLogger); + tagTestGenerator.setDestDir(outputTestsDirectory); + tagTestGenerator.createFiles(config); +*/ + // GenerateMojo tag handlers + TagHandlerGenerator tagHandlerGenerator = new TagHandlerGenerator( + this, mavenLogger); + tagHandlerGenerator.createFiles(config); + //Generate listeners + ListenerGenerator listenerGenerator = new ListenerGenerator(this, mavenLogger); + listenerGenerator.createFiles(config); + + JSFGeneratorConfiguration resourcesConfiguration = new JSFGeneratorConfiguration() { + + public ClassLoader getClassLoader() { + return createProjectClassLoader(executedProject); + } + + public File getDestDir() { + return outputResourcesDirectory; + } + + public String getKey() { + return key; + } + + public Template getTemplate(String name) throws GeneratorException { + return GenerateMojo.this.getTemplate(name); + } + + public String getTemplatesPath() { + return GenerateMojo.this.getTemplatesPath(); + } + + }; + // GenerateMojo faces-config + FacesConfigGenerator configGenerator = new FacesConfigGenerator( + resourcesConfiguration, mavenLogger); + configGenerator.setInclude(facesConfigInclude); + configGenerator.setFacesconfig(new File( + outputResourcesDirectory, "META-INF/faces-config.xml")); + RenderKitBean renderKitBean = configGenerator.createRenderKit(); + renderKitBean.setRenderkitid("HTML_BASIC"); + configGenerator.createFiles(config); + // GenerateMojo JSP taglib + if (null != taglib) { + TaglibGenerator taglibGenerator = new TaglibGenerator( + resourcesConfiguration, mavenLogger); + taglibGenerator.setUri(taglib.getUri()); + taglibGenerator.setShortname(taglib.getShortName()); + taglibGenerator.setListenerclass(taglib.getListenerClass()); + taglibGenerator.setDisplayname(taglib.getDisplayName()); + taglibGenerator.setListenerclass(taglib.getListenerClass()); + taglibGenerator.setValidatorclass(taglib.getValidatorClass()); + taglibGenerator.setTlibversion(taglib.getTlibVersion()); + taglibGenerator.setJspversion(taglib.getJspVersion()); + taglibGenerator.setInclude(taglibInclude); + taglibGenerator.setTaglib(new File( + outputResourcesDirectory, "META-INF/"+taglib.getShortName() + + ".tld")); + taglibGenerator.createFiles(config); + // GenerateMojo Facelets taglib + FaceletsTaglibGenerator faceletsTaglibGenerator = new FaceletsTaglibGenerator( + resourcesConfiguration, mavenLogger); + faceletsTaglibGenerator.setUri(taglib.getUri()); + faceletsTaglibGenerator.setShortname(taglib.getShortName()); + faceletsTaglibGenerator.setInclude(taglibInclude); + faceletsTaglibGenerator.setTaglib(new File( + outputResourcesDirectory, "META-INF/"+taglib.getShortName() + + ".taglib.xml")); + faceletsTaglibGenerator.createFiles(config); + } + + // Generate resources configuration file resources-config.xml + // for all images/scripts/css... + ResourcesConfigGenerator resourcesConfigGenerator = new ResourcesConfigGenerator(resourcesConfiguration, mavenLogger); + resourcesConfigGenerator.setInclude(resourcesInclude); + resourcesConfigGenerator.setTemplates(templatesDirectory); + resourcesConfigGenerator.setResourcesConfig(new File( + outputResourcesDirectory, "META-INF/resources-config.xml")); + resourcesConfigGenerator.createFiles(config); + + // Add generated sources and resources to project + project.addCompileSourceRoot(outputJavaDirectory.getPath()); +// project.addCompileSourceRoot(outputTestsDirectory.getPath()); + + Resource resource = new Resource(); + resource.setDirectory(outputResourcesDirectory.getPath()); +// resource.setTargetPath("META-INF"); + project.addResource(resource); + } catch (Exception e) { + getLog().error("Error on generate component", e); + throw new MojoExecutionException( + "Error in component generation", e); + } + Thread.currentThread().setContextClassLoader(contextCL); + } + + } + + protected BuilderConfig createConfig(ClassLoader generatiorLoader) + throws ParsingException { + BuilderConfig builderConfig = new BuilderConfig(generatiorLoader, + new MavenLogger(getLog())); + // Get all *.xml config files + FilenameFilter filter = new FilenameFilter() { + + public boolean accept(File dir, String name) { + + return name.toLowerCase().endsWith(".xml"); + } + + }; + File[] files = componentConfigDirectory.listFiles(filter); + if (null == files) { + throw new ParsingException("No config files found"); + } + for (int i = 0; i < files.length; i++) { + builderConfig.parseConfig(files[i]); + } + builderConfig.checkComopnentProperties(); + return builderConfig; + } + + public File getDestDir() { + // TODO Auto-generated method stub + return outputJavaDirectory; + } + + public String getKey() { + // TODO Auto-generated method stub + return key; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getClassLoader() + */ + public ClassLoader getClassLoader() { + return createProjectClassLoader(executedProject); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getTemplate(java.lang.String) + */ + public Template getTemplate(String name) throws GeneratorException { + // TODO Auto-generated method stub + try { + return this.velocity.getEngine().getTemplate(name); + } catch (ResourceNotFoundException e) { + throw new GeneratorException(e.getLocalizedMessage()); + } catch (ParseErrorException e) { + throw new GeneratorException(e.getLocalizedMessage()); + } catch (Exception e) { + throw new GeneratorException(e.getLocalizedMessage()); + } + } + + /* (non-Javadoc) + * @see org.ajax4jsf.builder.generator.JSFGeneratorConfiguration#getTemplatesPath() + */ + public String getTemplatesPath() { + return Library.JSF12.equals(library.getJsfVersion())?BuilderContext.TEMPLATES12_PATH:BuilderContext.TEMPLATES_PATH; + } + +}

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r1431 - in trunk/sandbox/scrollable-grid/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.

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

Author: konstantin.mishin Date: 2007-07-02 07:02:39 -0400 (Mon, 02 Jul 2007) New Revision: 1431 Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx Log: RF-368 Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-07-01 20:30:42 UTC (rev 1430) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-07-02 11:02:39 UTC (rev 1431) @@ -124,14 +124,8 @@ this.frozenContentBox = new ClientUI.common.box.Box(frozen); this.frozenContentBox.makeAbsolute(); - this.helpObject1 = new ClientUI.common.box.Box($(document.createElement("span")), this.contentBox.getElement()); - this.helpObject1.setWidth(10); - this.helpObject1.setHeight(10); - this.helpObject1.makeAbsolute(); - this.helpObject2 = new ClientUI.common.box.Box($(document.createElement("span")), this.frozenContentBox.getElement()); - this.helpObject2.setWidth(10); - this.helpObject2.setHeight(10); - this.helpObject2.makeAbsolute(); + this.helpObject1 = new ClientUI.common.box.Box(this.gridId + ":nho", this.contentBox.getElement()); + this.helpObject2 = new ClientUI.common.box.Box(this.gridId + ":fho", this.frozenContentBox.getElement()); // create row template var ch = this.frozenContentBox.getElement().firstChild; Modified: trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss =================================================================== --- trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss 2007-07-01 20:30:42 UTC (rev 1430) +++ trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss 2007-07-02 11:02:39 UTC (rev 1431) @@ -276,6 +276,12 @@ /** * Body row style */ +.ClientUI_Grid_HO { + position: absolute; + height: 10px; + width: 10px; +} + .ClientUI_Grid_BR { font: normal 8pt arial; white-space: nowrap; Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx =================================================================== --- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-01 20:30:42 UTC (rev 1430) +++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-02 11:02:39 UTC (rev 1431) @@ -97,6 +97,7 @@ </jsp:scriptlet> </tbody> </table> + <span class="ClientUI_Grid_HO" id="#{clientId}:fho" /> </span> <span class="ClientUI_TmplBox ClientUI_NormalBox" id="#{clientId}:body:NormalBox"> <table id="#{clientId}:n" cellpadding="0" cellspacing="0" style="border-collapse:collapse; table-layout:fixed"> @@ -115,6 +116,7 @@ </jsp:scriptlet> </tbody> </table> + <span class="ClientUI_Grid_HO" id="#{clientId}:nho" /> </span> </div> </div>

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r1430 - branches/refactor1/framework/api/src/main/java/org/richfaces/component.

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

Author: nbelaevski Date: 2007-07-01 16:30:42 -0400 (Sun, 01 Jul 2007) New Revision: 1430 Modified: branches/refactor1/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java branches/refactor1/framework/api/src/main/java/org/richfaces/component/LastElementAware.java Log: Fixed UIDataAdaptor excess imports Modified: branches/refactor1/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java =================================================================== --- branches/refactor1/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java 2007-06-30 00:13:26 UTC (rev 1429) +++ branches/refactor1/framework/api/src/main/java/org/richfaces/component/AbstractTreeDataModel.java 2007-07-01 20:30:42 UTC (rev 1430) @@ -29,7 +29,6 @@ import org.ajax4jsf.ajax.repeat.DataVisitor; import org.ajax4jsf.ajax.repeat.ExtendedDataModel; import org.ajax4jsf.ajax.repeat.Range; -import org.ajax4jsf.ajax.repeat.UIDataAdaptor; import org.richfaces.component.state.TreeRange; /** @@ -71,7 +70,7 @@ /** * walk sub-model having row key argument as its root * @param context faces context - * @param dataVisitor {@link UIDataAdaptor.ComponentVisitor} + * @param dataVisitor {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor.ComponentVisitor} * @param range {@link TreeRange} to constraint the walk * @param rowKey row key to treat as root of sub-model * @param argument implementation specific argument @@ -93,7 +92,7 @@ * Walk backing sub-model having row key argument as its root. If there is no backing model * configured, calling this method is equivalent to calling {@link #walk(FacesContext, DataVisitor, Range, Object, Object, boolean)} * @param facesContext faces context - * @param visitor {@link UIDataAdaptor.ComponentVisitor} instance + * @param visitor {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor.ComponentVisitor} instance * @param range {@link Range} to constraint the walk * @param key row key to treat as root of sub-model * @param argument implementation-specific argument Modified: branches/refactor1/framework/api/src/main/java/org/richfaces/component/LastElementAware.java =================================================================== --- branches/refactor1/framework/api/src/main/java/org/richfaces/component/LastElementAware.java 2007-06-30 00:13:26 UTC (rev 1429) +++ branches/refactor1/framework/api/src/main/java/org/richfaces/component/LastElementAware.java 2007-07-01 20:30:42 UTC (rev 1430) @@ -21,12 +21,10 @@ package org.richfaces.component; -import org.ajax4jsf.ajax.repeat.UIDataAdaptor; - /** * @author Konstantin Mishin * - * {@link UIDataAdaptor.ComponentVisitor} instances can implement this interface in order to + * {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor.ComponentVisitor} instances can implement this interface in order to * be notified of last element occurence at the current tree level. {@link #setLastElement()} * method is invoked before visiting last element and {@link #resetLastElement()} is called after * visiting last element.

17 years, 3 months

1
0
0 / 0

← Newer
1
...
51
52
53
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2007