richfaces-svn-commits June 2007

richfaces-svn-commits@lists.jboss.org

1 participants
459 discussions

JBoss Rich Faces SVN: r1399 - branches/refactor1.

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

Author: alexsmirnov Date: 2007-06-28 18:54:54 -0400 (Thu, 28 Jun 2007) New Revision: 1399 Modified: branches/refactor1/pom.xml Log: continue refactoring Modified: branches/refactor1/pom.xml =================================================================== --- branches/refactor1/pom.xml 2007-06-28 22:31:03 UTC (rev 1398) +++ branches/refactor1/pom.xml 2007-06-28 22:54:54 UTC (rev 1399) @@ -12,7 +12,9 @@ <module>framework</module> <module>ui</module> <module>ui/assembly</module> +  <module>docs</module> <module>samples</module> <!--

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1398 - in branches/refactor1/samples: richfaces-samples and 1 other directory.

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

Author: alexsmirnov Date: 2007-06-28 18:31:03 -0400 (Thu, 28 Jun 2007) New Revision: 1398 Added: branches/refactor1/samples/.svnignore branches/refactor1/samples/createProject.bat branches/refactor1/samples/createProject.sh branches/refactor1/samples/dataFilterSliderDemo/ branches/refactor1/samples/dataTableDemo/ branches/refactor1/samples/datascroller-sample/ branches/refactor1/samples/dragDropDemo/ branches/refactor1/samples/dropdownmenu-sample/ branches/refactor1/samples/gmap-sample/ branches/refactor1/samples/inputNumberSliderDemo/ branches/refactor1/samples/inputNumberSpinnerDemo/ branches/refactor1/samples/modalpanel-sample/ branches/refactor1/samples/panel-sample/ branches/refactor1/samples/panelbar-sample/ branches/refactor1/samples/pom.xml branches/refactor1/samples/richfaces-art-datatable/ branches/refactor1/samples/richfaces-demo/ branches/refactor1/samples/separator-sample/ branches/refactor1/samples/simpleTogglePanel-sample/ branches/refactor1/samples/skins/ branches/refactor1/samples/slidePanelDemo/ branches/refactor1/samples/suggestionbox-sample/ branches/refactor1/samples/tabPanelDemo/ branches/refactor1/samples/togglePanel-sample/ branches/refactor1/samples/togglePanelDemo/ branches/refactor1/samples/toolBarDemo/ branches/refactor1/samples/tree-demo/ Removed: branches/refactor1/samples/richfaces-samples/.svnignore branches/refactor1/samples/richfaces-samples/createProject.bat branches/refactor1/samples/richfaces-samples/createProject.sh branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/ branches/refactor1/samples/richfaces-samples/dataTableDemo/ branches/refactor1/samples/richfaces-samples/datascroller-sample/ branches/refactor1/samples/richfaces-samples/dragDropDemo/ branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/ branches/refactor1/samples/richfaces-samples/gmap-sample/ branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/ branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/ branches/refactor1/samples/richfaces-samples/modalpanel-sample/ branches/refactor1/samples/richfaces-samples/panel-sample/ branches/refactor1/samples/richfaces-samples/panelbar-sample/ branches/refactor1/samples/richfaces-samples/pom.xml branches/refactor1/samples/richfaces-samples/richfaces-art-datatable/ branches/refactor1/samples/richfaces-samples/richfaces-demo/ branches/refactor1/samples/richfaces-samples/separator-sample/ branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/ branches/refactor1/samples/richfaces-samples/skins/ branches/refactor1/samples/richfaces-samples/slidePanelDemo/ branches/refactor1/samples/richfaces-samples/suggestionbox-sample/ branches/refactor1/samples/richfaces-samples/tabPanelDemo/ branches/refactor1/samples/richfaces-samples/togglePanel-sample/ branches/refactor1/samples/richfaces-samples/togglePanelDemo/ branches/refactor1/samples/richfaces-samples/toolBarDemo/ branches/refactor1/samples/richfaces-samples/tree-demo/ Log: continue refactoring Copied: branches/refactor1/samples/.svnignore (from rev 1393, branches/refactor1/samples/richfaces-samples/.svnignore) =================================================================== --- branches/refactor1/samples/.svnignore (rev 0) +++ branches/refactor1/samples/.svnignore 2007-06-28 22:31:03 UTC (rev 1398) @@ -0,0 +1 @@ +target Copied: branches/refactor1/samples/createProject.bat (from rev 1393, branches/refactor1/samples/richfaces-samples/createProject.bat) =================================================================== --- branches/refactor1/samples/createProject.bat (rev 0) +++ branches/refactor1/samples/createProject.bat 2007-06-28 22:31:03 UTC (rev 1398) @@ -0,0 +1 @@ +mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Copied: branches/refactor1/samples/createProject.sh (from rev 1393, branches/refactor1/samples/richfaces-samples/createProject.sh) =================================================================== --- branches/refactor1/samples/createProject.sh (rev 0) +++ branches/refactor1/samples/createProject.sh 2007-06-28 22:31:03 UTC (rev 1398) @@ -0,0 +1,3 @@ +#!/bin/sh +mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ + -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=$1 \ No newline at end of file Copied: branches/refactor1/samples/dataFilterSliderDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo) Copied: branches/refactor1/samples/dataTableDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/dataTableDemo) Copied: branches/refactor1/samples/datascroller-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/datascroller-sample) Copied: branches/refactor1/samples/dragDropDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/dragDropDemo) Copied: branches/refactor1/samples/dropdownmenu-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/dropdownmenu-sample) Copied: branches/refactor1/samples/gmap-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/gmap-sample) Copied: branches/refactor1/samples/inputNumberSliderDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo) Copied: branches/refactor1/samples/inputNumberSpinnerDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo) Copied: branches/refactor1/samples/modalpanel-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/modalpanel-sample) Copied: branches/refactor1/samples/panel-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/panel-sample) Copied: branches/refactor1/samples/panelbar-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/panelbar-sample) Copied: branches/refactor1/samples/pom.xml (from rev 1393, branches/refactor1/samples/richfaces-samples/pom.xml) =================================================================== --- branches/refactor1/samples/pom.xml (rev 0) +++ branches/refactor1/samples/pom.xml 2007-06-28 22:31:03 UTC (rev 1398) @@ -0,0 +1,286 @@ +<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-samples</artifactId> + <packaging>pom</packaging> + <name>RichFaces Components Examples</name> + <version>3.1.0-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossrichfaces/samples</url> + <properties> +  + </properties> +  + <build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> +  + <version>6.1.3</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>8080</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>ajax4jsf</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces-samples</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/richfaces-samples</developerConnection> + <url>http://anonsvn.jboss.org/repos/richfaces/</url> + </scm> + + <distributionManagement> + <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</downloadUrl> + <repository> + <id>release-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snap-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <site> + <id>richfaces-samples-site</id> + <url>richfaces-samples/</url> + </site> + </distributionManagement> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url> + https://maven-repository.dev.java.net/nonav/repository + </url> + <layout>legacy</layout> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>maven.exadel.com</id> + <name>Jboss Repository for Maven Snapshots</name> + <url>http://maven.exadel.com/</url> + </repository> + </repositories> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <build> + <plugins> + <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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <build> + <defaultGoal>jetty:run</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_04</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>myfaces</id> + <properties> + <myfaces>1.1.5</myfaces> + <tomahawk>1.1.5</tomahawk> + </properties> + <build> + <plugins /> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>ajax4jsf</artifactId> + <version>3.1.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>${myfaces}</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>${myfaces}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <modules> + <module>skins</module> + <module>separator-sample</module> + <module>panel-sample</module> + <module>gmap-sample</module> + <module>togglePanel-sample</module> + <module>tabPanelDemo</module> + <module>simpleTogglePanel-sample</module> + <module>inputNumberSpinnerDemo</module> + <module>inputNumberSliderDemo</module> + <module>panelbar-sample</module> + <module>toolBarDemo</module> + <module>tree-demo</module> + <module>dataFilterSliderDemo</module> + <module>suggestionbox-sample</module> + <module>dragDropDemo</module> + <module>dataTableDemo</module> + <module>modalpanel-sample</module> + <module>datascroller-sample</module> + <module>richfaces-demo</module> + <module>dropdownmenu-sample</module> + </modules> +</project> \ No newline at end of file Copied: branches/refactor1/samples/richfaces-art-datatable (from rev 1393, branches/refactor1/samples/richfaces-samples/richfaces-art-datatable) Copied: branches/refactor1/samples/richfaces-demo (from rev 1393, branches/refactor1/samples/richfaces-samples/richfaces-demo) Deleted: branches/refactor1/samples/richfaces-samples/.svnignore =================================================================== --- branches/refactor1/samples/richfaces-samples/.svnignore 2007-06-28 22:13:05 UTC (rev 1397) +++ branches/refactor1/samples/richfaces-samples/.svnignore 2007-06-28 22:31:03 UTC (rev 1398) @@ -1 +0,0 @@ -target Deleted: branches/refactor1/samples/richfaces-samples/createProject.bat =================================================================== --- branches/refactor1/samples/richfaces-samples/createProject.bat 2007-06-28 22:13:05 UTC (rev 1397) +++ branches/refactor1/samples/richfaces-samples/createProject.bat 2007-06-28 22:31:03 UTC (rev 1398) @@ -1 +0,0 @@ -mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Deleted: branches/refactor1/samples/richfaces-samples/createProject.sh =================================================================== --- branches/refactor1/samples/richfaces-samples/createProject.sh 2007-06-28 22:13:05 UTC (rev 1397) +++ branches/refactor1/samples/richfaces-samples/createProject.sh 2007-06-28 22:31:03 UTC (rev 1398) @@ -1,3 +0,0 @@ -#!/bin/sh -mvn archetype:create -DarchetypeGroupId=org.ajax4jsf.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ - -DarchetypeVersion=1.1.1-SNAPSHOT -DgroupId=org.richfaces -DartifactId=$1 \ No newline at end of file Deleted: branches/refactor1/samples/richfaces-samples/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/pom.xml 2007-06-28 22:13:05 UTC (rev 1397) +++ branches/refactor1/samples/richfaces-samples/pom.xml 2007-06-28 22:31:03 UTC (rev 1398) @@ -1,286 +0,0 @@ -<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-samples</artifactId> - <packaging>pom</packaging> - <name>RichFaces Components Examples</name> - <version>3.1.0-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossrichfaces/samples</url> - <properties> -  - </properties> -  - <build> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> -  - <version>6.1.3</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>ajax4jsf</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces-samples</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/richfaces-samples</developerConnection> - <url>http://anonsvn.jboss.org/repos/richfaces/</url> - </scm> - - <distributionManagement> - <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</downloadUrl> - <repository> - <id>release-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>snap-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <site> - <id>richfaces-samples-site</id> - <url>richfaces-samples/</url> - </site> - </distributionManagement> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven-repository.dev.java.net/nonav/repository - </url> - <layout>legacy</layout> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven.exadel.com</id> - <name>Jboss Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - </repository> - </repositories> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <build> - <plugins> - <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>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <build> - <defaultGoal>jetty:run</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces</id> - <properties> - <myfaces>1.1.5</myfaces> - <tomahawk>1.1.5</tomahawk> - </properties> - <build> - <plugins /> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>ajax4jsf</artifactId> - <version>3.1.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces}</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>${myfaces}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <modules> - <module>skins</module> - <module>separator-sample</module> - <module>panel-sample</module> - <module>gmap-sample</module> - <module>togglePanel-sample</module> - <module>tabPanelDemo</module> - <module>simpleTogglePanel-sample</module> - <module>inputNumberSpinnerDemo</module> - <module>inputNumberSliderDemo</module> - <module>panelbar-sample</module> - <module>toolBarDemo</module> - <module>tree-demo</module> - <module>dataFilterSliderDemo</module> - <module>suggestionbox-sample</module> - <module>dragDropDemo</module> - <module>dataTableDemo</module> - <module>modalpanel-sample</module> - <module>datascroller-sample</module> - <module>richfaces-demo</module> - <module>dropdownmenu-sample</module> - </modules> -</project> \ No newline at end of file Copied: branches/refactor1/samples/separator-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/separator-sample) Copied: branches/refactor1/samples/simpleTogglePanel-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample) Copied: branches/refactor1/samples/skins (from rev 1393, branches/refactor1/samples/richfaces-samples/skins) Copied: branches/refactor1/samples/slidePanelDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/slidePanelDemo) Copied: branches/refactor1/samples/suggestionbox-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/suggestionbox-sample) Copied: branches/refactor1/samples/tabPanelDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/tabPanelDemo) Copied: branches/refactor1/samples/togglePanel-sample (from rev 1393, branches/refactor1/samples/richfaces-samples/togglePanel-sample) Copied: branches/refactor1/samples/togglePanelDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/togglePanelDemo) Copied: branches/refactor1/samples/toolBarDemo (from rev 1393, branches/refactor1/samples/richfaces-samples/toolBarDemo) Copied: branches/refactor1/samples/tree-demo (from rev 1393, branches/refactor1/samples/richfaces-samples/tree-demo)

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1397 - branches/refactor1/ui.

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

Author: alexsmirnov Date: 2007-06-28 18:13:05 -0400 (Thu, 28 Jun 2007) New Revision: 1397 Removed: branches/refactor1/ui/common/ Log: continue refactoring

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1396 - in branches/refactor1: framework/impl/src/main/resources/META-INF/skins and 8 other directories.

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

Author: alexsmirnov Date: 2007-06-28 18:04:11 -0400 (Thu, 28 Jun 2007) New Revision: 1396 Added: branches/refactor1/framework/impl/src/main/antlr/ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties branches/refactor1/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties branches/refactor1/framework/impl/src/main/resources/org/richfaces/ branches/refactor1/framework/test/src/test/java/org/richfaces/ branches/refactor1/framework/test/src/test/resources/org/richfaces/ Removed: branches/refactor1/ui/common/src/main/antlr/ branches/refactor1/ui/common/src/main/resources/META-INF/skins/blueSky.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/classic.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/deepMarine.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/emeraldTown.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/japanCherry.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/plain.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/ruby.skin.properties branches/refactor1/ui/common/src/main/resources/META-INF/skins/wine.skin.properties branches/refactor1/ui/common/src/main/resources/org/richfaces/ branches/refactor1/ui/common/src/test/java/org/richfaces/ branches/refactor1/ui/common/src/test/resources/org/richfaces/ Log: continue refactoring Copied: branches/refactor1/framework/impl/src/main/antlr (from rev 1393, branches/refactor1/ui/common/src/main/antlr) Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/blueSky.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,50 @@ +#Colors +headerBackgroundColor=#BED6F8 +headerGradientColor=#F2F7FF +headerTextColor=#000000 +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#ECF4FE + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#BED6F8 +subBorderColor=#ffffff + +tabBackgroundColor=#C6DEFF +tabDisabledTextColor=#8DB7F3 + +trimColor=#D6E6FB + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/classic.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,52 @@ +#Colors +headerBackgroundColor=#4A75B5 +headerGradientColor=#93C4E5 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#F3F2F2 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#EAF0F8 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#9FBDEB +tabDisabledTextColor=#6A92CF + +trimColor=#C6D6EA + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 + + Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/deepMarine.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,54 @@ +#Colors +headerBackgroundColor=#008894 +headerGradientColor=#79C9D0 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#C2EAEE + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#11808A +subBorderColor=#D8E5E6 + +tabBackgroundColor=#529CA3 +tabDisabledTextColor=#11808A + +trimColor=#C9EDF0 + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#228C96 +hoverLinkColor=#00717C +visitedLinkColor=#228C96 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 + + + + Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/emeraldTown.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,54 @@ +#Colors +headerBackgroundColor=#005000 +headerGradientColor=#70BA70 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#f1f1f1 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#E2F6E2 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#ADCDAD +tabDisabledTextColor=#67AA67 + +trimColor=#BBECBB + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#FF9409 + + +generalLinkColor=#43BD43 +hoverLinkColor=#FF9409 +visitedLinkColor=#43BD43 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 + + + + Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/japanCherry.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,53 @@ +#Colors +headerBackgroundColor=#E8BDBD +headerGradientColor=#FBD9D9 +headerTextColor=#980808 +headerWeightFont=bold + +generalBackgroundColor=#F8ECEC +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#E9F0F0 + +shadowBackgroundColor=#980808 +shadowOpacity=1 + +panelBorderColor=#DFA5A5 +subBorderColor=#FFF3F3 + +tabBackgroundColor=#F3C1C1 +tabDisabledTextColor=#DF8989 + +trimColor=#F7D5D5 + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#CF0000 +hoverLinkColor=#FF0000 +visitedLinkColor=#CF0000 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#DFA5A5 + + + Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/plain.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,50 @@ +#Colors +headerBackgroundColor=#{null} +headerGradientColor=#{null} +headerTextColor=#{null} +headerWeightFont=#{null} + +generalBackgroundColor=#{null} +generalTextColor=#{null} +generalSizeFont=#{null} +generalFamilyFont=#{null} + +controlTextColor=#{null} +controlBackgroundColor=#{null} +additionalBackgroundColor=#{null} + +shadowBackgroundColor=#{null} +shadowOpacity=#{null} + +panelBorderColor=#{null} +subBorderColor=#{null} + +tabBackgroundColor=#{null} +tabDisabledTextColor=#{null} + +trimColor=#{null} + +tipBackgroundColor=#{null} +tipBorderColor=#{null} + +selectControlColor=#{null} + + +generalLinkColor=#{null} +hoverLinkColor=#{null} +visitedLinkColor=#{null} + +# Fonts +headerSizeFont=#{null} +headerFamilyFont=#{null} + +tabSizeFont=#{null} +tabFamilyFont=#{null} + +buttonSizeFont=#{null} +buttonFamilyFont=#{null} + +tableBackgroundColor=#{null} +tableFooterBackgroundColor=#{null} +tableSubfooterBackgroundColor=#{null} +tableBorderColor=#{null} \ No newline at end of file Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/ruby.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,54 @@ +#Colors +headerBackgroundColor=#900000 +headerGradientColor=#DF5858 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#f1f1f1 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#F9E4E4 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#EDAEAE +tabDisabledTextColor=#C47979 + +trimColor=#F7C4C4 + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#FF9409 + + +generalLinkColor=#CF0000 +hoverLinkColor=#FF0000 +visitedLinkColor=#CF0000 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 + + + + Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties (from rev 1393, branches/refactor1/ui/common/src/main/resources/META-INF/skins/wine.skin.properties) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -0,0 +1,54 @@ +#Colors +headerBackgroundColor=#5D7343 +headerGradientColor=#9AB37D +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#EDEADD +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#EEE9D1 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#B6AD84 +subBorderColor=#EDEADD + +tabBackgroundColor=#9AB37D +tabDisabledTextColor=#A49449 + +trimColor=#E1D2AF + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#C29632 +hoverLinkColor=#F0A700 +visitedLinkColor=#C29632 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#B6AD84 + + + Copied: branches/refactor1/framework/impl/src/main/resources/org/richfaces (from rev 1393, branches/refactor1/ui/common/src/main/resources/org/richfaces) Copied: branches/refactor1/framework/test/src/test/java/org/richfaces (from rev 1393, branches/refactor1/ui/common/src/test/java/org/richfaces) Copied: branches/refactor1/framework/test/src/test/resources/org/richfaces (from rev 1393, branches/refactor1/ui/common/src/test/resources/org/richfaces) Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/blueSky.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/blueSky.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/blueSky.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,50 +0,0 @@ -#Colors -headerBackgroundColor=#BED6F8 -headerGradientColor=#F2F7FF -headerTextColor=#000000 -headerWeightFont=bold - -generalBackgroundColor=#FFFFFF -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#ECF4FE - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#BED6F8 -subBorderColor=#ffffff - -tabBackgroundColor=#C6DEFF -tabDisabledTextColor=#8DB7F3 - -trimColor=#D6E6FB - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#0078D0 -hoverLinkColor=#0090FF -visitedLinkColor=#0090FF - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/classic.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/classic.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/classic.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,52 +0,0 @@ -#Colors -headerBackgroundColor=#4A75B5 -headerGradientColor=#93C4E5 -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#F3F2F2 -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#EAF0F8 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#C0C0C0 -subBorderColor=#ffffff - -tabBackgroundColor=#9FBDEB -tabDisabledTextColor=#6A92CF - -trimColor=#C6D6EA - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#0078D0 -hoverLinkColor=#0090FF -visitedLinkColor=#0090FF - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 - - Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/deepMarine.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/deepMarine.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/deepMarine.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,54 +0,0 @@ -#Colors -headerBackgroundColor=#008894 -headerGradientColor=#79C9D0 -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#FFFFFF -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#C2EAEE - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#11808A -subBorderColor=#D8E5E6 - -tabBackgroundColor=#529CA3 -tabDisabledTextColor=#11808A - -trimColor=#C9EDF0 - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#228C96 -hoverLinkColor=#00717C -visitedLinkColor=#228C96 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 - - - - Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/emeraldTown.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,54 +0,0 @@ -#Colors -headerBackgroundColor=#005000 -headerGradientColor=#70BA70 -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#f1f1f1 -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#E2F6E2 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#C0C0C0 -subBorderColor=#ffffff - -tabBackgroundColor=#ADCDAD -tabDisabledTextColor=#67AA67 - -trimColor=#BBECBB - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#FF9409 - - -generalLinkColor=#43BD43 -hoverLinkColor=#FF9409 -visitedLinkColor=#43BD43 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 - - - - Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/japanCherry.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/japanCherry.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/japanCherry.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,53 +0,0 @@ -#Colors -headerBackgroundColor=#E8BDBD -headerGradientColor=#FBD9D9 -headerTextColor=#980808 -headerWeightFont=bold - -generalBackgroundColor=#F8ECEC -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#E9F0F0 - -shadowBackgroundColor=#980808 -shadowOpacity=1 - -panelBorderColor=#DFA5A5 -subBorderColor=#FFF3F3 - -tabBackgroundColor=#F3C1C1 -tabDisabledTextColor=#DF8989 - -trimColor=#F7D5D5 - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#CF0000 -hoverLinkColor=#FF0000 -visitedLinkColor=#CF0000 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#DFA5A5 - - - Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/plain.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/plain.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/plain.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,50 +0,0 @@ -#Colors -headerBackgroundColor=#{null} -headerGradientColor=#{null} -headerTextColor=#{null} -headerWeightFont=#{null} - -generalBackgroundColor=#{null} -generalTextColor=#{null} -generalSizeFont=#{null} -generalFamilyFont=#{null} - -controlTextColor=#{null} -controlBackgroundColor=#{null} -additionalBackgroundColor=#{null} - -shadowBackgroundColor=#{null} -shadowOpacity=#{null} - -panelBorderColor=#{null} -subBorderColor=#{null} - -tabBackgroundColor=#{null} -tabDisabledTextColor=#{null} - -trimColor=#{null} - -tipBackgroundColor=#{null} -tipBorderColor=#{null} - -selectControlColor=#{null} - - -generalLinkColor=#{null} -hoverLinkColor=#{null} -visitedLinkColor=#{null} - -# Fonts -headerSizeFont=#{null} -headerFamilyFont=#{null} - -tabSizeFont=#{null} -tabFamilyFont=#{null} - -buttonSizeFont=#{null} -buttonFamilyFont=#{null} - -tableBackgroundColor=#{null} -tableFooterBackgroundColor=#{null} -tableSubfooterBackgroundColor=#{null} -tableBorderColor=#{null} \ No newline at end of file Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/ruby.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/ruby.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/ruby.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,54 +0,0 @@ -#Colors -headerBackgroundColor=#900000 -headerGradientColor=#DF5858 -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#f1f1f1 -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#F9E4E4 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#C0C0C0 -subBorderColor=#ffffff - -tabBackgroundColor=#EDAEAE -tabDisabledTextColor=#C47979 - -trimColor=#F7C4C4 - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#FF9409 - - -generalLinkColor=#CF0000 -hoverLinkColor=#FF0000 -visitedLinkColor=#CF0000 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 - - - - Deleted: branches/refactor1/ui/common/src/main/resources/META-INF/skins/wine.skin.properties =================================================================== --- branches/refactor1/ui/common/src/main/resources/META-INF/skins/wine.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) +++ branches/refactor1/ui/common/src/main/resources/META-INF/skins/wine.skin.properties 2007-06-28 22:04:11 UTC (rev 1396) @@ -1,54 +0,0 @@ -#Colors -headerBackgroundColor=#5D7343 -headerGradientColor=#9AB37D -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#EDEADD -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#EEE9D1 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#B6AD84 -subBorderColor=#EDEADD - -tabBackgroundColor=#9AB37D -tabDisabledTextColor=#A49449 - -trimColor=#E1D2AF - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#C29632 -hoverLinkColor=#F0A700 -visitedLinkColor=#C29632 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#B6AD84 - - -

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1395 - in branches/refactor1: framework and 67 other directories.

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

Author: alexsmirnov Date: 2007-06-28 17:59:51 -0400 (Thu, 28 Jun 2007) New Revision: 1395 Added: branches/refactor1/framework/api/target/ branches/refactor1/framework/api/target/classes/ branches/refactor1/framework/impl/src/main/java/org/richfaces/ branches/refactor1/framework/test/ branches/refactor1/framework/test/.svnignore branches/refactor1/framework/test/pom.xml branches/refactor1/framework/test/src/ branches/refactor1/framework/test/src/main/ branches/refactor1/framework/test/src/main/java/ branches/refactor1/framework/test/src/main/java/org/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockValueBinding.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewHandler.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/xml/ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java branches/refactor1/framework/test/src/main/resources/ branches/refactor1/framework/test/src/main/resources/WEB-INF/ branches/refactor1/framework/test/src/main/resources/WEB-INF/complex-web.xml branches/refactor1/framework/test/src/main/resources/WEB-INF/web.xml branches/refactor1/framework/test/src/test/ branches/refactor1/framework/test/src/test/java/ branches/refactor1/framework/test/src/test/java/DnDScriptTest.java branches/refactor1/framework/test/src/test/java/README.txt branches/refactor1/framework/test/src/test/java/org/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/ActionListenerTest.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/AllUIRepeatTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockComponentState.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataAdaptor.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataModel.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockRange.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockSerializableDataModel.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/RepeatTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTest.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTestSuite.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/Bean.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/TestApplicationFactory.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/AllTests.java branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/WebXmlTest.java branches/refactor1/framework/test/src/test/resources/ branches/refactor1/framework/test/src/test/resources/META-INF/ branches/refactor1/framework/test/src/test/resources/META-INF/skins/ branches/refactor1/framework/test/src/test/resources/META-INF/skins/DEFAULT.skin.properties branches/refactor1/framework/test/src/test/resources/META-INF/skins/cyclic.skin.properties branches/refactor1/framework/test/src/test/resources/META-INF/skins/noref.skin.properties branches/refactor1/framework/test/src/test/resources/META-INF/skins/style.skin.properties branches/refactor1/framework/test/src/test/resources/META-INF/skins/test.skin.properties branches/refactor1/framework/test/src/test/resources/WEB-INF/ branches/refactor1/framework/test/src/test/resources/WEB-INF/complex-web.xml branches/refactor1/framework/test/src/test/resources/WEB-INF/web.xml branches/refactor1/framework/test/src/test/resources/bindedtest.skin.properties branches/refactor1/framework/test/src/test/resources/log4j.xml branches/refactor1/framework/test/src/test/resources/org/ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/styles.xml branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/test.js branches/refactor1/framework/test/src/test/resources/oscache.properties branches/refactor1/framework/test/src/test/resources/placeholder.txt branches/refactor1/framework/test/src/test/resources/test.skin.properties branches/refactor1/framework/test/src/test/resources/test.web.root Removed: branches/refactor1/ui/common/src/main/java/org/richfaces/ Modified: branches/refactor1/framework/impl/pom.xml branches/refactor1/framework/pom.xml branches/refactor1/pom.xml branches/refactor1/ui/assembly/pom.xml branches/refactor1/ui/common/pom.xml 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/gmap/pom.xml branches/refactor1/ui/inputnumber-slider/pom.xml branches/refactor1/ui/inputnumber-spinner/pom.xml branches/refactor1/ui/menu-components/pom.xml branches/refactor1/ui/modal-panel/pom.xml branches/refactor1/ui/paint2D/pom.xml branches/refactor1/ui/panel/pom.xml branches/refactor1/ui/panelbar/pom.xml branches/refactor1/ui/pom.xml branches/refactor1/ui/separator/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/togglePanel/pom.xml branches/refactor1/ui/toolBar/pom.xml branches/refactor1/ui/tree/pom.xml Log: continue refactoring Modified: branches/refactor1/framework/impl/pom.xml =================================================================== --- branches/refactor1/framework/impl/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/framework/impl/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -114,6 +114,11 @@ <artifactId>commons-collections</artifactId> <version>3.2</version> </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>api</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <profiles> <profile> Copied: branches/refactor1/framework/impl/src/main/java/org/richfaces (from rev 1393, branches/refactor1/ui/common/src/main/java/org/richfaces) Modified: branches/refactor1/framework/pom.xml =================================================================== --- branches/refactor1/framework/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/framework/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -7,7 +7,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> - <artifactId>cdk</artifactId> + <artifactId>framework</artifactId> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> <dependencies /> Added: branches/refactor1/framework/test/.svnignore =================================================================== --- branches/refactor1/framework/test/.svnignore (rev 0) +++ branches/refactor1/framework/test/.svnignore 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1 @@ +target Added: branches/refactor1/framework/test/pom.xml =================================================================== --- branches/refactor1/framework/test/pom.xml (rev 0) +++ branches/refactor1/framework/test/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,76 @@ +<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>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <artifactId>test</artifactId> + <name>Ajax4Jsf test framework</name> + <url>https://ajax4jsf.dev.java.net</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.shale</groupId> + <artifactId>shale-test</artifactId> + <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>1.10</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.2.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,477 @@ +/** + * 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.tests; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.net.URL; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Random; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import javax.faces.FacesException; +import javax.faces.FactoryFinder; +import javax.faces.component.UIComponent; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.render.RenderKitFactory; +import javax.faces.render.Renderer; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; + +import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer; +import org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl; +import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.framework.resource.InternetResourceBuilder; +import org.ajax4jsf.framework.skin.SkinBean; +import org.ajax4jsf.framework.skin.SkinFactory; +import org.ajax4jsf.framework.skin.VersionBean; +import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.tests.org.apache.shale.test.config.ConfigParser; +import org.apache.shale.test.base.AbstractJsfTestCase; +import org.apache.shale.test.mock.MockPrintWriter; +import org.apache.shale.test.mock.MockResponseWriter; +import org.apache.shale.test.mock.MockServletOutputStream; + +import com.gargoylesoftware.htmlunit.MockWebConnection; +import com.gargoylesoftware.htmlunit.Page; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequestSettings; +import com.gargoylesoftware.htmlunit.WebResponse; +import com.gargoylesoftware.htmlunit.WebResponseData; +import com.gargoylesoftware.htmlunit.WebResponseImpl; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + * Base class for testing components and renderers in a4j framework + * Simulate a4j environment for perform requests. + * For concrete tests MUST be overriden setUp/tearDown methods, even if no actions + * performed - it need for junit initializations. + * All output html collected and can be checked by htmlunit + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.5 $ $Date: 2007/02/20 20:58:08 $ + * + */ +public class AbstractAjax4JsfTestCase extends AbstractJsfTestCase { + + protected final static String SLASHED_RESOURCE_URI_PREFIX = "/" + WebXml.RESOURCE_URI_PREFIX; + + private File tmpRoot = null; + + /** + * @param name + */ + public AbstractAjax4JsfTestCase(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see org.apache.shale.test.base.AbstractJsfTestCase#setUp() + */ + public void setUp() throws Exception { + // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call + super.setUp(); + + // Setup FacesContext with nessesary init parameters. + this.servletContext.addInitParameter(SkinFactory.SKIN_PARAMETER, getSkinName()); + // setup VCP renderKit, create renderers. + RenderKitFactory vcpRenderKitFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); + vcpRenderKit = new ChameleonRenderKitImpl(); + vcpRenderKitFactory.addRenderKit("HTML_CHAMELEON", vcpRenderKit); + renderKit.addRenderer(UIViewRoot.COMPONENT_FAMILY, UIViewRoot.COMPONENT_TYPE, new AjaxViewRootRenderer()); + // setup nessesary components. + application.addComponent("javax.faces.ViewRoot", MockViewRoot.class.getName()); + // setup AjaxContext. + ajaxContext = new AjaxContext(); + request.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, ajaxContext); + // Setup ViewHandler / ViewRoot. + application.setViewHandler(new MockViewHandler(application.getViewHandler())); + facesContext.setViewRoot(application.getViewHandler().createView(facesContext, facesContext.getViewRoot().getViewId())); + // Setup Skin avd version variables. + servletContext.setAttribute("a4j", new VersionBean()); + servletContext.setAttribute("a4jSkin", new SkinBean()); + // Setup servlet context and testing web.xml + request.setPathElements("/testContext","/faces","/vievId.jsf",""); + + File webRoot = new File(getClass().getResource("/WEB-INF/web.xml").getFile()).getParentFile().getParentFile(); + if (webRoot.exists()) { + servletContext.setDocumentRoot(webRoot); + } else { + // Prepare WEB-ROOT in temp folder + tmpRoot = File.createTempFile("TmpTestRoot" + new Random().nextInt(), null); + tmpRoot.delete(); + tmpRoot.mkdir(); + servletContext.setDocumentRoot(tmpRoot); + + URL jarUrl = AbstractAjax4JsfTestCase.class.getProtectionDomain().getCodeSource().getLocation(); + ZipInputStream zis = new ZipInputStream(jarUrl.openStream()); + try { + ZipEntry entry; + byte[] buffer = new byte[8192]; + while ((entry = zis.getNextEntry()) != null) { + String name = entry.getName(); + if (name.startsWith("WEB-INF/")) { + File out = new File(tmpRoot, name); + if (entry.isDirectory()) { + out.mkdirs(); + } else { + out.getParentFile().mkdirs(); + OutputStream os = new FileOutputStream(out); + try { + int count; + while ((count = zis.read(buffer)) > 0) { + os.write(buffer, 0, count); + } + } finally { + os.close(); + } + zis.closeEntry(); + } + } + } + } catch (IOException e) { + deleteRecursively(tmpRoot); + throw e; + } + servletContext.setDocumentRoot(tmpRoot); + } + + try { + InternetResourceBuilder.getInstance().init(); + } catch (FacesException e) { + InternetResourceBuilder.setInstance(null); + } + webXml = new WebXml(); + webXml.init(servletContext, "A4J"); + + ConfigParser parser = new ConfigParser(); + parser.parse(parser.getPlatformURLs()); + + Enumeration resources = getClass().getClassLoader().getResources("META-INF/faces-config.xml"); + while (resources.hasMoreElements()) { + parser.parse((URL) resources.nextElement()); + } + } + + protected WebClient createWebClient() { + WebClient client = new WebClient(); + //disable javascript for now as HtmlUnit doesn't treat prototype.js well + client.setJavaScriptEnabled(false); + + return client; + } + + /** + * + */ + protected void setupWebClient() { + ajaxContext = null; + // setup webClient for got response content. + webClient = createWebClient(); + webConnection = new MockWebConnection(webClient) { + public WebResponse getResponse(WebRequestSettings settings) + throws IOException { + String testResourceContextPath = facesContext.getExternalContext().getRequestContextPath() + + AbstractAjax4JsfTestCase.SLASHED_RESOURCE_URI_PREFIX; + if (settings.getURL().getFile().startsWith(testResourceContextPath)) { + String uri = settings.getURL().getFile().substring(testResourceContextPath.length()); + + InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance(); + + InternetResource resource = resourceBuilder.getResourceForKey(uri); + Object resourceData = resourceBuilder.getResourceDataForKey(uri); + + final MockFacesResourceContext resourceContext = new MockFacesResourceContext(facesContext); + resourceContext.setResourceData(resourceData); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + response.setOutputStream(new MockServletOutputStream(baos)); + + resource.sendHeaders(resourceContext); + resource.send(resourceContext); + + return new WebResponseImpl( + new WebResponseData( + new ByteArrayInputStream(baos.toByteArray()), + HttpServletResponse.SC_OK, + "OK", + resourceContext.getHeaders()), + settings.getURL(), + settings.getSubmitMethod(), + 0) { + + public String getContentType() { + return resourceContext.getContentType(); + } + }; + + } else { + return super.getResponse(settings); + } + } + }; + webClient.setWebConnection(webConnection); + webConnection.setDefaultResponse("<html><body>not found</body></html>",404,"NOT FOUND","text/html"); + webClient.setThrowExceptionOnFailingStatusCode(false); + webClient.setThrowExceptionOnScriptError(false); + } + + private void deleteRecursively(File file) { + if (file != null) { + + String[] list = file.list(); + if (list != null) { + for (int i = 0; i < list.length; i++) { + String name = list[i]; + File f = new File(file, name); + if (f.isDirectory()) { + deleteRecursively(f); + } else { + f.delete(); + } + } + } + + file.delete(); + } + } + + + /* (non-Javadoc) + * @see org.apache.shale.test.base.AbstractJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + // This method MUST BE OVERRIDEN in any subclasses - since Junit see for it in class for call + super.tearDown(); + vcpRenderKit = null; +// Thread.currentThread().setContextClassLoader(threadContextClassLoader); +// threadContextClassLoader = null; + webClient = null; + webConnection = null; + writer = null; + SkinFactory.reset(); + InternetResourceBuilder.setInstance(null); + + deleteRecursively(tmpRoot); + } + + // Protected configurations URL's + /** + * Hook method for setup current VCP skin name for test. default use "classic" + * @return + */ + protected String getSkinName() { + return "DEFAULT"; + } + + /** + * Hook method for load diffrernt frameworks for this test. + * Can return URL's for jars with tested implementation. + * @return + */ + protected URL[] getImplementationUrls() { + return new URL[0]; + } + + /** + * Create component with given render kit and unique Id from ViewRoot. + * @param type - component type. + * @param clazz - class of component. + * @param rendererType - name for renderer type ( can be null ). + * @param rendererClazz - class of renderer in HTMP_BASIC renderkit. If not null, renderer will created and registered. + * @param skinRendererClazz - class of renderer in Skin render-kit. + * @return component instance. + * @throws Exception + */ + protected UIComponent createComponent(String type, String className, String rendererType, Class rendererClazz,Class skinRendererClazz) { + UIComponent comp; + try { + comp = application.createComponent(type); + } catch (FacesException e) { + application.addComponent(type, className); + comp = application.createComponent(type); + } + comp.setRendererType(rendererType); + String family = comp.getFamily(); + if (null != rendererClazz) { + Renderer renderer = renderKit.getRenderer(family, rendererType); + if (null == renderer) { + try { + renderer = (Renderer) rendererClazz.newInstance(); + } catch (InstantiationException e) { + assertTrue("Instantiation exception for create renderer "+rendererClazz.getName(),false); + } catch (IllegalAccessException e) { + assertTrue("ILEGAL access exception for create renderer "+rendererClazz.getName(),false); + } + renderKit.addRenderer(family, rendererType, renderer); + } + } + if(null != skinRendererClazz) { + Renderer renderer = renderKit.getRenderer(family, rendererType); + if (null == renderer) { + try { + renderer = (Renderer) skinRendererClazz.newInstance(); + } catch (InstantiationException e) { + assertTrue("Instantiation exception for create renderer "+skinRendererClazz.getName(),false); + } catch (IllegalAccessException e) { + assertTrue("ILEGAL access exception for create renderer "+skinRendererClazz.getName(),false); + } + vcpRenderKit.addRenderer(family, rendererType, renderer); + } + } + comp.setId(facesContext.getViewRoot().createUniqueId()); + return comp; + } + + + /** + * Render all children for given component. + * @param component + * @throws IOException + */ + protected void renderChildren(FacesContext context, + UIComponent component) throws IOException { + if (component.getChildCount() > 0) { + for (Iterator it = component.getChildren().iterator(); it.hasNext();) { + UIComponent child = (UIComponent) it.next(); + renderChild(context,child); + } + } + } + + + /** + * Render one component and it childrens + * @param child + * @throws IOException + */ + protected void renderChild(FacesContext context, UIComponent child) + throws IOException { + if (!child.isRendered()) { + return; + } + + child.encodeBegin(context); + if (child.getRendersChildren()) { + child.encodeChildren(context); + } else { + renderChildren(context, child); + } + child.encodeEnd(context); + } + + /** + * Render test view and parse to htmlunit page structure. + * @return + * @throws Exception + */ + protected HtmlPage renderView() throws Exception { + setupResponseWriter(); + renderChild(facesContext, facesContext.getViewRoot()); + return processResponseWriter(); + } + + /** + * Finish response processing by call {@link javax.faces.context.ResponseWriter#endDocument()} and parse + * result to htmlunit {@link HtmlPage} + * @return + * @throws IOException + * @throws Exception + */ + protected HtmlPage processResponseWriter() throws IOException, Exception { + writer.endDocument(); + return (HtmlPage) processResponse(); + } + + /** + * Setup Faces {@link javax.faces.context.ResponseWriter} and prepare rendering ( startDocument ). + * after this method, any jsf rendering methods can be performed, and results can be checked by {@link #processResponseWriter()} + * @throws IOException + */ + protected void setupResponseWriter() throws IOException { + writer = (MockResponseWriter) renderKit.createResponseWriter(response.getWriter(),"text/html",null); + facesContext.setResponseWriter(writer); + writer.startDocument(); + } + + /** + * Parse collected content of mock response to Page instance, used for check rendered html. + * @return + * @throws Exception + */ + protected Page processResponse() throws Exception { + setupWebClient(); + URL page = new URL( "http:"+ facesContext.getExternalContext().getRequestContextPath() + facesContext.getViewRoot().getViewId()); + try { + char[] content = ((MockPrintWriter) response.getWriter()).content(); + webConnection.setResponse(page,String.valueOf(content),response.getStatus(), "OK", response.getContentType(), Collections.EMPTY_LIST); + } catch (IllegalStateException e) { + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + webConnection.setResponse(page,content, response.getStatus(), "OK", response.getContentType(), Collections.EMPTY_LIST); + } + return webClient.getPage(page); + } + + protected AjaxContext ajaxContext = null; + + /** + * Initialised instance of VCP render kit. + */ + protected ChameleonRenderKitImpl vcpRenderKit = null; + + /** + * Instance of Mock {@link javax.faces.context.ResponseWriter} , created by setupResponseWriter + */ + protected MockResponseWriter writer; + + /** + * <p>The htmlunit web client for this test case. </p> + * + */ + protected WebClient webClient = null; + + /** + * Mock web connection for accept stored content of JSF encoding. For testing JavaScript code, all URL's for scripts must be + * rregistered by {@link MockWebConnection#setResponse(java.net.URL, byte[], int, java.lang.String, java.lang.String, java.util.List)} method + * By default, for unregistered pages return 404 - not found. + */ + protected MockWebConnection webConnection = null; + + + // Thread context class loader saved and restored after each test + private ClassLoader threadContextClassLoader = null; + + protected WebXml webXml; + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,234 @@ +/** + * 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.tests; + +import javax.faces.context.FacesContext; + +import junit.framework.AssertionFailedError; +import junit.framework.TestResult; + +import org.ajax4jsf.framework.ajax.AjaxContext; +import org.apache.shale.test.mock.MockFacesContext; +import org.apache.shale.test.mock.MockHttpServletRequest; +import org.apache.shale.test.mock.MockHttpServletResponse; +import org.apache.shale.test.mock.MockHttpSession; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/20 20:58:08 $ + * +/** + * A multi-threaded JUnit test case, with setup faces environment. + * To perform test cases that spin off threads to do tests: <p> + * <UL> + * <LI>Extend <code>MultiThreadedTestCase</code> + * <LI>Write your tests cases as normal except for when you want to spin off threads. + * <LI>When you want to spin off threads: + * <UL> + * <LI>Instead of implementing <code>Runnable</code> extend <code>MultiThreadedTestCase.TestCaseRunnable</code>. + * <LI>Define <code>runTestCase ()</code> to do your test, you may call <code>fail (), assert ()</code> etc. and throw + * exceptions with impunity. + * <LI>Handle thread interrupts by finishing. + * </UL> + * <LI>Instantiate all the runnables (one for each thread you wish to spawn) and pass an array of them + * to <code>runTestCaseRunnables ()</code>. + * </UL> + * That's it. An example is below: + * <PRE> + * public class MTTest extends ThreadedVcpJsfTestCase + * { + * MTTest (String s) { super (s); } + * public class CounterThread extends TestCaseRunnable + * { + * public void runTestCase (FacesContext context) throws Throwable + * { + * for (int i = 0; i < 1000; i++) + * { + * System.out.println ("Counter Thread: " + Thread.currentThread () + " : " + i); + * // Do some testing... + * if (Thread.currentThread ().isInterrupted ()) { + * return; + * } + * } + * } + * } + * + * public void test1 () + * { + * TestCaseRunnable tct [] = new TestCaseRunnable [5]; + * for (int i = 0; i < 5; i++) + * { + * tct[i] = new CounterThread (); + * } + * runTestCaseRunnables (tct); + * } + * } + * </PRE> + * <BR><STRONG>Category: Test</STRONG> + * <BR><STRONG>Not guaranteed to be thread safe.</STRONG> +*/ +public class AbstractThreadedAjax4JsfTestCase extends AbstractAjax4JsfTestCase { + + /** + * The threads that are executing. + */ + private Thread threads[] = null; + /** + * The tests TestResult.*/ + private TestResult testResult = null; + /** + * Simple constructor. + */ + + public AbstractThreadedAjax4JsfTestCase(String s) { + super(s); + } + /** + * Interrupt the running threads. + */ + + public void interruptThreads() { + if(threads != null) { + for(int i = 0;i < threads.length;i++) { + threads[i].interrupt(); + } + } + } + /** + * Override run so we can squirrel away the test result.*/ + + public void run(final TestResult result) { + testResult = result; + super.run(result); + testResult = null; + } + + /** + * Create instances of classes and run threads with it. + * @param clazz - class of test thread implementation. + * @param numThreads - number of threads to run. + * @throws InstantiationException + * @throws IllegalAccessException + */ + protected void runTestCaseThreads(Class clazz, int numThreads) { + TestCaseRunnable[] runnables = new TestCaseRunnable[numThreads]; + for (int i = 0; i < runnables.length; i++) { + try { + runnables[i]= (TestCaseRunnable) clazz.newInstance(); + } catch (Exception e) { + testResult.addError(this, e); + return; + } + } + runTestCaseRunnables(runnables); + } + /** + * Run the test case threads. + * @param runnables - array with instances of {@link TestCaseRunnable} with concrete tests + */ + protected void runTestCaseRunnables (final TestCaseRunnable[] runnables) { + if(runnables == null) { + throw new IllegalArgumentException("runnables is null"); + } + threads = new Thread[runnables.length]; + for(int i = 0;i < threads.length;i++) { + threads[i] = new Thread(runnables[i]); + } + for(int i = 0;i < threads.length;i++) { + threads[i].start(); + } + try { + for(int i = 0;i < threads.length;i++) { + threads[i].join(); + } + } + catch(InterruptedException ignore) { + System.out.println("Thread join interrupted."); + } + threads = null; + } + /** + * Handle an exception. Since multiple threads won't have their + * exceptions caught the threads must manually catch them and call + * <code>handleException ()</code>. + * @param t Exception to handle.*/ + + private void handleException(final Throwable t) { + synchronized(testResult) { + if(t instanceof AssertionFailedError) { + testResult.addFailure(this, (AssertionFailedError)t); + } + else { + testResult.addError(this, t); + } + } + } + + /** + * A test case thread. Override runTestCase () and define + * behaviour of test in there.*/ + public abstract class TestCaseRunnable implements Runnable { + /** + * Override this to define the test*/ + + public abstract void runTestCase(FacesContext context) + throws Throwable; + /** + * Run the test in an environment where + * we can handle the exceptions generated by the test method.*/ + + public void run() { + FacesContext context = null; + try { + context = createFacesContext(); + runTestCase(context); + } + catch(Throwable t) /* Any other exception we handle and then we interrupt the other threads.*/ { + handleException(t); + interruptThreads(); + } finally { + if(null != context) { + context.release(); + } + } + } + } + + /** + * Create instance of faces context for current thread. + * @return + */ + protected FacesContext createFacesContext() { + MockHttpSession tsession = new MockHttpSession(); + MockHttpServletRequest trequest = new MockHttpServletRequest(tsession); + trequest.setAttribute(AjaxContext.AJAX_CONTEXT_KEY, new AjaxContext()); + MockHttpServletResponse tresponse = new MockHttpServletResponse(); + MockFacesContext tfacesContext = (MockFacesContext) + facesContextFactory.getFacesContext(servletContext, + trequest, + tresponse, + lifecycle); + tfacesContext.setApplication(application); + tfacesContext.setViewRoot(application.getViewHandler().createView(facesContext, facesContext.getViewRoot().getViewId())); + return tfacesContext; + } +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockAjax4JsfLifecycle.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,39 @@ +/** + * 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.tests; + +import javax.faces.context.FacesContext; + +import org.apache.shale.test.mock.MockLifecycle; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:08 $ + * + */ +public class MockAjax4JsfLifecycle extends MockLifecycle { + + public void processAll(FacesContext context) { + + } + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockFacesResourceContext.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,90 @@ +/** + * 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.tests; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.resource.FacesResourceContext; +import org.apache.shale.test.mock.MockHttpServletResponse; + +import com.gargoylesoftware.htmlunit.KeyValuePair; + +/** + * @author Nick - mailto:nbelaevski@exadel.com + * created 03.04.2007 + * + */ +public class MockFacesResourceContext extends FacesResourceContext { + + private String contentType; + //used to encode headers properly + private MockHttpServletResponse mockResponse = new MockHttpServletResponse(); + private Set headerSet = new LinkedHashSet(); + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public String getContentType() { + return contentType; + } + + public void setDateHeader(String name, long value) { + headerSet.add(name); + mockResponse.setDateHeader(name, value); + } + + public void setHeader(String name, String value) { + headerSet.add(name); + mockResponse.setHeader(name, value); + } + + public void setIntHeader(String name, int value) { + headerSet.add(name); + mockResponse.setIntHeader(name, value); + } + + public List getHeaders() { + List headers = new ArrayList(); + for (Iterator iterator = headerSet.iterator(); iterator + .hasNext();) { + String headerName = (String) iterator.next(); + + String headerValue = mockResponse.getHeader(headerName); + if (headerValue != null) { + headers.add(new KeyValuePair(headerName, headerValue)); + } + } + + return headers; + } + + public MockFacesResourceContext(FacesContext facesContext) { + super(facesContext); + } + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockMethodBinding.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,87 @@ +/** + * 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.ajax4jsf.tests; + +import java.util.ArrayList; +import java.util.List; + +import javax.faces.context.FacesContext; +import javax.faces.el.EvaluationException; +import javax.faces.el.MethodBinding; +import javax.faces.el.MethodNotFoundException; + +/** + * @author Nick - mailto:nbelaevski@exadel.com + * created 09.04.2007 + * + */ +public class MockMethodBinding extends MethodBinding { + + private Class returnType; + private MethodResult result; + + private List invocationArgs = new ArrayList(); + + public static interface MethodResult { + public Object invoke(FacesContext facesContext, Object[] args, Class returnType); + } + + public MockMethodBinding() { + this(null, null); + } + + public MockMethodBinding(Class returnType, MethodResult result) { + super(); + this.returnType = returnType; + this.result = result; + } + + public Class getType(FacesContext context) throws MethodNotFoundException { + if (context == null) { + throw new NullPointerException(); + } + + return returnType; + } + + public Object invoke(FacesContext context, Object[] params) + throws EvaluationException, MethodNotFoundException { + if (context == null) { + throw new NullPointerException(); + } + + invocationArgs.add(params); + if (result != null) { + return result.invoke(context, params, returnType); + } + + return null; + } + + public void clear() { + invocationArgs.clear(); + } + + public Object[][] getInvocationArgs() { + return (Object[][]) invocationArgs.toArray(new Object[invocationArgs.size()][]); + } +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockUIInputRenderer.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,32 @@ +/** + * 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.tests; + +import javax.faces.render.Renderer; + +/** + * @author shura + * + */ +public class MockUIInputRenderer extends Renderer { + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockValueBinding.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockValueBinding.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockValueBinding.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,74 @@ +/** + * 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.tests; + +import javax.faces.context.FacesContext; +import javax.faces.el.EvaluationException; +import javax.faces.el.PropertyNotFoundException; +import javax.faces.el.ValueBinding; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 13.04.2007 + * + */ +public class MockValueBinding extends ValueBinding { + + private Class clazz; + private Object value; + + public MockValueBinding(Object value, Class clazz) { + super(); + this.clazz = clazz; + this.value = value; + } + + public Class getType(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + return clazz; + } + + public Object getValue(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + if (context == null) { + throw new NullPointerException(); + } + + return value; + } + + public boolean isReadOnly(FacesContext context) throws EvaluationException, + PropertyNotFoundException { + return false; + } + + public void setValue(FacesContext context, Object value) + throws EvaluationException, PropertyNotFoundException { + + if (context == null) { + throw new NullPointerException(); + } + + this.value = value; + } + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewHandler.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewHandler.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewHandler.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,41 @@ +/** + * 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.tests; + +import java.io.IOException; + +import javax.faces.application.ViewHandler; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.ajax.AjaxViewHandler; + +public class MockViewHandler extends AjaxViewHandler { + + public MockViewHandler(ViewHandler parent) { + super(parent); + } + + public void writeState(FacesContext context) throws IOException { + //System.out.println(".writeState()"); + } + +} \ No newline at end of file Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/MockViewRoot.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,49 @@ +/** + * 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.tests; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; + +import org.ajax4jsf.framework.ajax.AjaxViewRoot; +import org.apache.commons.collections.Buffer; + +/** + * @author Nick - mailto:nbelaevski@exadel.com + * created 08.04.2007 + * + */ +public class MockViewRoot extends AjaxViewRoot { + + public Buffer getAjaxEventsQueue(FacesContext context) { + return super.getAjaxEventsQueue(context); + } + + public Buffer[] getEvents(FacesContext context) { + return super.getEvents(context); + } + + public Buffer getEventsQueue(FacesContext context, PhaseId phase) { + return super.getEventsQueue(context, phase); + } + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/org/apache/shale/test/config/ConfigParser.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,507 @@ +/** + * 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 + */ + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ajax4jsf.tests.org.apache.shale.test.config; + +import java.io.IOException; +import java.net.URL; +import javax.faces.FactoryFinder; +import javax.faces.application.Application; +import javax.faces.application.ApplicationFactory; +import javax.faces.render.RenderKit; +import javax.faces.render.RenderKitFactory; +import javax.faces.render.Renderer; + +import org.ajax4jsf.tests.xml.FacesEntityResolver; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.Rule; +import org.apache.shale.test.mock.MockRenderKit; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * <p>Utility class to parse JavaServer Faces configuration resources, and + * register JSF artifacts with the mock object hierarchy.</p> + * + * <p>The following artifacts are registered:</p> + * <ul> + * <li><code>Converter</code> (by-id and by-class)</li> + * <li><code>RenderKit</code> and <code>Renderer</code></li> + * <li><code>UIComponent</code></li> + * <li><code>Validator</code></li> + * </ul> + * + * <p>Note that any declared <em>factory</em> instances are explicitly + * <strong>NOT</strong> registered, allowing the mock object hierarchy + * of the Shale Test Framework to manage these APIs.</p> + * + * <p><strong>USAGE NOTE</strong> - If you are using an instance of this + * class within a subclass of <code>AbstractJsfTestCase</code> or + * <code>AbstractJmockJsfTestCase</code>, be sure you have completed the + * <code>setUp()</code> processing in this base class before calling one + * of the <code>parse()</code> methods.</p> + * + * @since 1.1 + */ +public final class ConfigParser { + + + // ------------------------------------------------------------ Constructors + + + /** Creates a new instance of ConfigParser */ + public ConfigParser() { + } + + + // ------------------------------------------------------ Manifest Constants + + + /** + * <p>Configuration resource URLs for the JSF RI.</p> + */ + private static final String[] JSFRI_RESOURCES = + { "/com/sun/faces/jsf-ri-runtime.xml", + }; + + + /** + * <p>Configuration resource URLs for Apache MyFaces.</p> + */ + private static final String[] MYFACES_RESOURCES = + { "/org/apache/myfaces/resource/standard-faces-config.xml", + }; + + + // ------------------------------------------------------ Instance Variables + + + /** + * <p>The <code>Digester</code> instance we will use for parsing.</p> + */ + private Digester digester = null; + + + // ------------------------------------------------------- Public Properties + + + /** + * <p>Return the URLs of the platform configuration resources for this + * application. The following platforms are currently supported:</p> + * <ul> + * <li>JavaServer Faces Reference Implementation (version 1.0 - 1.2)</li> + * <li>MyFaces (version 1.1)</li> + * </ul> + * + * <p>If MyFaces (version 1.2), currently under development, does not change + * the name of the configuration resource, it will be supported as well.</p> + */ + public URL[] getPlatformURLs() { + + URL[] urls = translate(JSFRI_RESOURCES); + if (urls[0] == null) { + urls = translate(MYFACES_RESOURCES); + } + return urls; + + } + + + // ---------------------------------------------------------- Public Methods + + + /** + * <p>Parse the specified JavaServer Faces configuration resource, causing + * the appropriate JSF artifacts to be registered with the mock object + * hierarchy.</p> + * + * @param url <code>URL</code> of the configuration resource to parse + * + * @exception IOException if an input/output error occurs + * @exception SAXException if a parsing error occurs + */ + public void parse(URL url) throws IOException, SAXException { + + // Acquire and configure the Digester instance we will use + Digester digester = digester(); + ApplicationFactory factory = (ApplicationFactory) + FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY); + Application application = factory.getApplication(); + digester.push(application); + + // Perform the required parsing + try { + digester.parse(new InputSource(url.openStream())); + } finally { + digester.clear(); + } + + } + + + /** + * <p>Parse the specified set of JavaServer Faces configuration resources, + * in the listed order, causing the appropriate JSF artifacts to be registered + * with the mock object hierarchy.</p> + * + * @param urls <code>URL</code>s of the configuration resources to parse + * + * @exception IOException if an input/output error occurs + * @exception SAXException if a parsing error occurs + */ + public void parse(URL[] urls) throws IOException, SAXException { + + for (int i = 0; i < urls.length; i++) { + parse(urls[i]); + } + + } + + + // --------------------------------------------------------- Private Methods + + + /** + * <p>Return the <code>Digester</code> instance we will use for parsing, + * creating and configuring a new instance if necessary.</p> + */ + private Digester digester() { + + if (this.digester == null) { + this.digester = new Digester(); + digester.addRule("faces-config/component", new ComponentRule()); + digester.addCallMethod + ("faces-config/component/component-type", "setComponentType", 0); + digester.addCallMethod + ("faces-config/component/component-class", "setComponentClass", 0); + digester.addRule("faces-config/converter", new ConverterRule()); + digester.addCallMethod + ("faces-config/converter/converter-id", "setConverterId", 0); + digester.addCallMethod + ("faces-config/converter/converter-class", "setConverterClass", 0); + digester.addCallMethod + ("faces-config/converter/converter-for-class", "setConverterForClass", 0); + digester.addRule("faces-config/render-kit", new RenderKitRule()); + digester.addRule("faces-config/render-kit/render-kit-id", new RenderKitIdRule()); + digester.addRule("faces-config/render-kit/renderer", new RendererRule()); + digester.addCallMethod + ("faces-config/render-kit/renderer/component-family", "setComponentFamily", 0); + digester.addCallMethod + ("faces-config/render-kit/renderer/renderer-class", "setRendererClass", 0); + digester.addCallMethod + ("faces-config/render-kit/renderer/renderer-type", "setRendererType", 0); + digester.addRule("faces-config/validator", new ValidatorRule()); + digester.addCallMethod + ("faces-config/validator/validator-id", "setValidatorId", 0); + digester.addCallMethod + ("faces-config/validator/validator-class", "setValidatorClass", 0); + } + + digester.setEntityResolver(new FacesEntityResolver()); + + return this.digester; + + } + + + /** + * <p>Translate an array of resource names into an array of resource URLs.</p> + * + * @param names Resource names to translate + */ + private URL[] translate(String[] names) { + + URL[] results = new URL[names.length]; + for (int i = 0; i < names.length; i++) { + results[i] = this.getClass().getResource(names[i]); + } + return results; + + } + + + // --------------------------------------------------------- Private Classes + + + /** + * <p>Data bean that stores information related to a component.</p> + */ + class ComponentBean { + + private String componentClass; + public String getComponentClass() { + return this.componentClass; + } + public void setComponentClass(String componentClass) { + this.componentClass = componentClass; + } + + private String componentType; + public String getComponentType() { + return this.componentType; + } + public void setComponentType(String componentType) { + this.componentType = componentType; + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing components.</p> + */ + class ComponentRule extends Rule { + + public void begin(String namespace, String name, Attributes attributes) { + getDigester().push(new ComponentBean()); + } + + public void end(String namespace, String name) { + ComponentBean bean = (ComponentBean) getDigester().pop(); + Application application = (Application) getDigester().peek(); + application.addComponent(bean.getComponentType(), bean.getComponentClass()); + } + + } + + + /** + * <p>Data bean that stores information related to a converter.</p> + */ + class ConverterBean { + + private String converterClass; + public String getConverterClass() { + return this.converterClass; + } + public void setConverterClass(String converterClass) { + this.converterClass = converterClass; + } + + private String converterForClass; + public String getConverterForClass() { + return this.converterForClass; + } + public void setConverterForClass(String converterForClass) { + this.converterForClass = converterForClass; + } + + private String converterId; + public String getConverterId() { + return this.converterId; + } + public void setConverterId(String converterId) { + this.converterId = converterId; + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing converers.</p> + */ + class ConverterRule extends Rule { + + public void begin(String namespace, String name, Attributes attributes) { + getDigester().push(new ConverterBean()); + } + + public void end(String namespace, String name) { + ConverterBean bean = (ConverterBean) getDigester().pop(); + Application application = (Application) getDigester().peek(); + if (bean.getConverterId() != null) { + application.addConverter(bean.getConverterId(), bean.getConverterClass()); + } else { + Class clazz = null; + try { + clazz = this.getClass().getClassLoader().loadClass(bean.getConverterForClass()); + } catch (ClassNotFoundException e) { + throw new IllegalArgumentException("java.lang.ClassNotFoundException: " + + bean.getConverterForClass()); + } + application.addConverter(clazz, bean.getConverterClass()); + } + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing render kits.</p> + */ + class RenderKitRule extends Rule { + + public void begin(String namespace, String name, Attributes attributes) { + RenderKitFactory factory = (RenderKitFactory) + FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); + getDigester().push(factory.getRenderKit(null, RenderKitFactory.HTML_BASIC_RENDER_KIT)); + } + + public void end(String namespace, String name) { + getDigester().pop(); + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing render kit identifiers.</p> + */ + class RenderKitIdRule extends Rule { + + public void body(String namespace, String name, String text) { + String renderKitId = text.trim(); + RenderKitFactory factory = (RenderKitFactory) + FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); + RenderKit renderKit = factory.getRenderKit(null, renderKitId); + if (renderKit == null) { + renderKit = new MockRenderKit(); + factory.addRenderKit(renderKitId, renderKit); + } + digester.pop(); + digester.push(renderKit); + } + + } + + + /** + * <p>Data bean that stores information related to a renderer.</p> + */ + class RendererBean { + + private String componentFamily; + public String getComponentFamily() { + return this.componentFamily; + } + public void setComponentFamily(String componentFamily) { + this.componentFamily = componentFamily; + } + + private String rendererClass; + public String getRendererClass() { + return this.rendererClass; + } + public void setRendererClass(String rendererClass) { + this.rendererClass = rendererClass; + } + + private String rendererType; + public String getRendererType() { + return this.rendererType; + } + public void setRendererType(String rendererType) { + this.rendererType = rendererType; + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing renderers.</p> + */ + class RendererRule extends Rule { + + public void begin(String namespace, String name, Attributes attributes) { + getDigester().push(new RendererBean()); + } + + public void end(String namespace, String name) { + RendererBean bean = (RendererBean) getDigester().pop(); + RenderKit kit = (RenderKit) getDigester().peek(); + Renderer renderer = null; + Class clazz = null; + try { + clazz = this.getClass().getClassLoader().loadClass(bean.getRendererClass()); + renderer = (Renderer) clazz.newInstance(); + } catch (Exception e) { + throw new IllegalArgumentException("Exception while trying to instantiate" + + " renderer class '" + bean.getRendererClass() + "' : " + + e.getMessage()); + } + kit.addRenderer(bean.getComponentFamily(), bean.getRendererType(), + renderer); + } + + } + + + /** + * <p>Data bean that stores information related to a validator.</p> + */ + class ValidatorBean { + + private String validatorClass; + public String getValidatorClass() { + return this.validatorClass; + } + public void setValidatorClass(String validatorClass) { + this.validatorClass = validatorClass; + } + + private String validatorId; + public String getValidatorId() { + return this.validatorId; + } + public void setValidatorId(String validatorId) { + this.validatorId = validatorId; + } + + } + + + /** + * <p>Digester <code>Rule</code> for processing validators.</p> + */ + class ValidatorRule extends Rule { + + public void begin(String namespace, String name, Attributes attributes) { + getDigester().push(new ValidatorBean()); + } + + public void end(String namespace, String name) { + ValidatorBean bean = (ValidatorBean) getDigester().pop(); + Application application = (Application) getDigester().peek(); + application.addValidator(bean.getValidatorId(), bean.getValidatorClass()); + } + + } + + +} Added: branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java =================================================================== --- branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java (rev 0) +++ branches/refactor1/framework/test/src/main/java/org/ajax4jsf/tests/xml/FacesEntityResolver.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,73 @@ +/** + * 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.tests.xml; + +import java.io.IOException; +import java.net.URL; + +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 09.04.2007 + * + */ +public class FacesEntityResolver implements EntityResolver { + + private static final String[] PREFIXES = new String[] { + "/com/sun/faces/", "/org/apache/myfaces/resource/" + }; + + /* (non-Javadoc) + * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String) + */ + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + + if (systemId == null) { + return null; + } + + String fileName; + + int idx = systemId.lastIndexOf('/'); + if (idx == -1) { + fileName = systemId; + } else { + fileName = systemId.substring(idx + 1); + } + + for (int i = 0; i < PREFIXES.length; i++) { + String prefix = PREFIXES[i]; + + URL url = getClass().getResource(prefix + fileName); + if (url != null) { + return new InputSource(url.openStream()); + } + } + + return null; + } + +} Added: branches/refactor1/framework/test/src/main/resources/WEB-INF/complex-web.xml =================================================================== --- branches/refactor1/framework/test/src/main/resources/WEB-INF/complex-web.xml (rev 0) +++ branches/refactor1/framework/test/src/main/resources/WEB-INF/complex-web.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,328 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + + <display-name>Flex Enterprise Services</display-name> + <description>Flex Enterprise Services Application</description> + + <context-param> + <param-name>flex.class.path</param-name> + <param-value>/WEB-INF/flex/hotfixes,/WEB-INF/flex/jars</param-value> + </context-param> + + + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + <description>Comma separated list of URIs of (additional) faces config files. + (e.g. /WEB-INF/my-config.xml) + See JSF 1.0 PRD2, 10.3.2</description> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + <description>State saving method: "client" or "server" (= default) + See JSF Specification 2.5.2</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> + <param-value>true</param-value> + <description>This parameter tells MyFaces if javascript code should be allowed in the + rendered HTML output. + If javascript is allowed, command_link anchors will have javascript code + that submits the corresponding form. + If javascript is not allowed, the state saving info and nested parameters + will be added as url parameters. + Default: "true"</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.PRETTY_HTML</param-name> + <param-value>true</param-value> + <description>If true, rendered HTML code will be formatted, so that it is "human readable". + i.e. additional line separators and whitespace will be written, that do not + influence the HTML code. + Default: "true"</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> + <param-value>true</param-value> + <description>If true, a javascript function will be rendered that is able to restore the + former vertical scroll on every request. Convenient feature if you have pages + with long lists and you do not want the browser page to always jump to the top + if you trigger a link or button action that stays on the same page. + Default: "false"</description> + </context-param> + <context-param> + <param-name>tiles-definitions</param-name> + <param-value>/WEB-INF/tiles.xml</param-value> + </context-param> + <context-param> +<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> +<param-value>org.apache.myfaces.application.jsp.JspTilesViewHandlerImpl</param-value> +</context-param> + + + <filter> + <filter-name>extensionsFilter</filter-name> + <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class> + <init-param> + <param-name>uploadMaxFileSize</param-name> + <param-value>10m</param-value> + <description>Set the size limit for uploaded files. + Format: 10 - 10 bytes + 10k - 10 KB + 10m - 10 MB + 1g - 1 GB</description> + </init-param> + <init-param> + <param-name>uploadThresholdSize</param-name> + <param-value>1k</param-value> + <description>Set the threshold size - files + below this limit are stored in memory, files above + this limit are stored on disk. + + Format: 10 - 10 bytes + 10k - 10 KB + 10m - 10 MB + 1g - 1 GB + </description> + </init-param> + </filter> +  + <filter> + <filter-name>shale</filter-name> + <filter-class> + org.apache.shale.faces.ShaleApplicationFilter + </filter-class> + </filter> + <filter> + <filter-name>security</filter-name> + <filter-class> + com.pfizer.eNCA.filter.SecurityFilter + </filter-class> + </filter> + <filter> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + </filter-mapping> + <filter-mapping> + <filter-name>shale</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>extensionsFilter</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>extensionsFilter</filter-name> + <url-pattern>/faces/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>security</filter-name> + <url-pattern>/jsp/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> + </listener> +  + <listener> + <listener-class>org.apache.commons.chain.web.ChainListener</listener-class> + </listener> + <listener> + <listener-class>com.pfizer.eNCA.util.SessionListener</listener-class> + </listener> + +  + <servlet> + <servlet-name>MessageBrokerServlet</servlet-name> + <display-name>MessageBrokerServlet</display-name> + <servlet-class>flex.messaging.MessageBrokerServlet</servlet-class> + <init-param> + <param-name>services.configuration.file</param-name> + <param-value>/WEB-INF/flex/flex-enterprise-services.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexMxmlServlet</servlet-name> + <display-name>MXML Processor</display-name> + <description>Servlet wrapper for the Mxml Compiler</description> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex2.server.j2ee.MxmlServlet</param-value> + </init-param> + <init-param> + <param-name>webtier.configuration.file</param-name> + <param-value>/WEB-INF/flex/flex-webtier-config.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexSwfServlet</servlet-name> + <display-name>SWF Retriever</display-name> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex2.server.j2ee.SwfServlet</param-value> + </init-param> +  + <load-on-startup>2</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexInternalServlet</servlet-name> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex.server.j2ee.filemanager.FileManagerServlet</param-value> + </init-param> + <load-on-startup>10</load-on-startup> + </servlet> + + + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>updateRequest</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.AJAXServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>treeRequest</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.TreeStateServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>renderExcel</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.RenderExcel</servlet-class> + </servlet> + <servlet> + <servlet-name>renderSPlus</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.RenderSPlus</servlet-class> + </servlet> + <servlet> + <servlet-name>pkFile</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.PKFileReaderServlet</servlet-class> + <init-param> + <param-name>requiredSessionObject</param-name> + <param-value>loggedInUser</param-value> + <description>Require Session Object for Security</description> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>MessageBrokerServlet</servlet-name> + <url-pattern>/messagebroker/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexMxmlServlet</servlet-name> + <url-pattern>*.mxml</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexSwfServlet</servlet-name> + <url-pattern>*.swf</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexInternalServlet</servlet-name> + <url-pattern>/flex-internal/*</url-pattern> + </servlet-mapping> + + + <servlet-mapping> + <servlet-name>renderExcel</servlet-name> + <url-pattern>renderexcel.csv</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>renderSPlus</servlet-name> + <url-pattern>rendersplus.sdd</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>updateRequest</servlet-name> + <url-pattern>/updateRequest/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>treeRequest</servlet-name> + <url-pattern>/treeRequest/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>pkFile</servlet-name> + <url-pattern>/pk/*</url-pattern> + </servlet-mapping> + <mime-mapping> + <extension>doc</extension> + <mime-type>application/msword</mime-type> + </mime-mapping> + <mime-mapping> + <extension>xls</extension> + <mime-type>application/vnd.ms-excel</mime-type> + </mime-mapping> + <mime-mapping> + <extension>ppt</extension> + <mime-type>application/vnd.ms-powerpoint</mime-type> + </mime-mapping> + <mime-mapping> + <extension>swf</extension> + <mime-type>application/x-shockwave-flash</mime-type> + </mime-mapping> + <mime-mapping> + <extension>pdf</extension> + <mime-type>application/pdf</mime-type> + </mime-mapping> + <mime-mapping> + <extension>inc</extension> + <mime-type>text/html</mime-type> + </mime-mapping> + <mime-mapping> + <extension>zip</extension> + <mime-type>application/zip</mime-type> + </mime-mapping> + <mime-mapping> + <extension>exe</extension> + <mime-type>application/octet-stream</mime-type> + </mime-mapping> + <mime-mapping> + <extension>csv</extension> + <mime-type>application/x-csv</mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file>/jsp/index.jsp</welcome-file> + </welcome-file-list> + <taglib> + <taglib-uri>http://struts.apache.org/tags-tiles</taglib-uri> + <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> + </taglib> + + <security-constraint> + <display-name>Restrict access to JSP pages</display-name> + <web-resource-collection> + <web-resource-name>Restrict access to JSP pages</web-resource-name> + <url-pattern>/jsp/*.jsp</url-pattern> + </web-resource-collection> + <auth-constraint> + <description>With no roles defined, no access granted</description> + </auth-constraint> + </security-constraint> +</web-app> + Added: branches/refactor1/framework/test/src/main/resources/WEB-INF/web.xml =================================================================== --- branches/refactor1/framework/test/src/main/resources/WEB-INF/web.xml (rev 0) +++ branches/refactor1/framework/test/src/main/resources/WEB-INF/web.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>testcase</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + + <filter> + <description>Convert HTML to XML</description> + <display-name>Filter</display-name> + <filter-name>A4J</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>publicid</param-name> + <param-value>-//W3C//DTD XHTML 1.0 Transitional//EN</param-value> + </init-param> + <init-param> + <param-name>systemid</param-name> + <param-value>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</param-value> + </init-param> + <init-param> + <param-name>namespace</param-name> + <param-value>http://www.w3.org/1999/xhtml</param-value> + </init-param> + <init-param> + <param-name>forceparser</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>rewriteid</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>mime-type</param-name> + <param-value>text/xml</param-value> + </init-param> + <init-param> + <param-name>log4j-init-file</param-name> + <param-value>WEB-INF/log4j.xml</param-value> + </init-param> + <init-param> + <param-name>enable-cache</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> +</web-app> Added: branches/refactor1/framework/test/src/test/java/DnDScriptTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/DnDScriptTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/DnDScriptTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,75 @@ +/** + * 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 + */ + +import java.io.IOException; + +import org.ajax4jsf.dnd.DnDScript; +import org.ajax4jsf.framework.resource.FacesResourceContext; +import org.ajax4jsf.framework.resource.ResourceContext; +import org.ajax4jsf.framework.resource.TemplateCSSResource; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * + */ + +/** + * @author shura + * + */ +public class DnDScriptTest extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public DnDScriptTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceBase#send(org.ajax4jsf.framework.resource.ResourceContext)}. + */ + public void testSend() { + DnDScript resource = new DnDScript(); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + e.printStackTrace(); + assertTrue("error send style",false); + } + } + +} Added: branches/refactor1/framework/test/src/test/java/README.txt =================================================================== Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/ActionListenerTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/ActionListenerTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/ActionListenerTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,154 @@ +/** + * 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.ajax; + +import java.io.Serializable; + +import javax.faces.component.UICommand; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.convert.IntegerConverter; +import javax.faces.event.ActionEvent; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +import junit.framework.TestCase; + +/** + * @author shura + * + */ +public class ActionListenerTest extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public ActionListenerTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.UIActionParameter#getValue()}. + */ + public void testGetValue() { + Bean bean = new Bean(); + bean.setFirst(1); + bean.setSecond(2.0); + UIActionParameter param = new UIActionParameter(); + param.setConverter(new TestConverter()); + param.setValue(bean); + assertEquals("1;2.0", param.getValue()); + } + + public void testGetIntValue() throws Exception { + UIActionParameter param = new UIActionParameter(); + application.addConverter(Integer.class, IntegerConverter.class.getName()); + param.setValue(new Integer(1)); + assertEquals("1", param.getValue()); + } + + static class TestConverter implements Converter { + + /* (non-Javadoc) + * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String) + */ + public Object getAsObject(FacesContext context, UIComponent comp, String str) { + Bean bean = new Bean(); + String[] values = str.split(";"); + bean.setFirst(Integer.parseInt(values[0])); + bean.setSecond(Double.parseDouble(values[1])); + return bean; + } + + /* (non-Javadoc) + * @see javax.faces.convert.Converter#getAsString(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.Object) + */ + public String getAsString(FacesContext context, UIComponent comp, Object value) { + Bean bean = (Bean) value; + return String.valueOf(bean.getFirst())+";"+String.valueOf(bean.getSecond()); + } + + } + + public static class Bean implements Serializable { + int _first; + double _second; + /** + * @return the first + */ + public int getFirst() { + return this._first; + } + /** + * @param first the first to set + */ + public void setFirst(int first) { + this._first = first; + } + /** + * @return the second + */ + public double getSecond() { + return this._second; + } + /** + * @param second the second to set + */ + public void setSecond(double second) { + this._second = second; + } + } + + /** + * Test method for {@link org.ajax4jsf.ajax.UIActionParameter#processAction(javax.faces.event.ActionEvent)}. + */ + public void testProcessAction() { + UICommand command = new UICommand(); + UIActionParameter param = new UIActionParameter(); + param.setConverter(new IntegerConverter()); + param.setName("param"); + param.setAssignToBinding(application.createValueBinding("#{bean.first}")); + Bean bean = new Bean(); + request.setAttribute("bean", bean); + request.addParameter("param", "123"); + externalContext.getRequestParameterMap().put("param", "123"); + command.addActionListener(param); + command.broadcast(new ActionEvent(command)); + assertEquals(123, bean.getFirst()); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/AllUIRepeatTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/AllUIRepeatTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/AllUIRepeatTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,38 @@ +/** + * 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.ajax.repeat; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllUIRepeatTests { + + public static Test suite() { + TestSuite suite = new TestSuite("Test for org.ajax4jsf.ajax.repeat"); + //$JUnit-BEGIN$ + suite.addTestSuite(DataAdaptorTestCase.class); + suite.addTestSuite(RepeatTestCase.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,387 @@ +/** + * 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.ajax.repeat; + +import java.io.IOException; +import java.util.ArrayList; + +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; +import javax.faces.component.UIData; +import javax.faces.component.UIInput; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.MockUIInputRenderer; + +/** + * @author shura + * + */ +public class DataAdaptorTestCase extends AbstractAjax4JsfTestCase { + + private UIDataAdaptor adaptor; + + private UIInput child; + + private int childInvoked; + + private UIInput facetChild; + + private int facetInvoked; + + private UIInput childChild; + + private int childChildInvoked; + + private UIInput childChildFacet; + + private int childChildFacetInvoked; + + UIData data; + /** + * @param name + */ + public DataAdaptorTestCase(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + // Create mock DataAdaptor and childs. + adaptor = new MockDataAdaptor(); + child = new UIInput(){ + public void processDecodes(FacesContext context) { + childInvoked++; + super.processDecodes(context); + } + }; + childInvoked = 0; + child.setId("child"); + adaptor.getChildren().add(child); + facetChild = new UIInput(){ + public void processDecodes(FacesContext context) { + facetInvoked++; + super.processDecodes(context); + } + }; + facetInvoked = 0; + facetChild.setId("facetChild"); + adaptor.getFacets().put("facet", facetChild); + childChild = new UIInput(){ + public void processDecodes(FacesContext context) { + childChildInvoked++; + super.processDecodes(context); + } + };; + childChildInvoked = 0; + childChild.setId("childChild"); + child.getChildren().add(childChild); + childChildFacet = new UIInput(){ + public void processDecodes(FacesContext context) { + childChildFacetInvoked++; + super.processDecodes(context); + } + };; + childChildFacetInvoked = 0; + childChildFacet.setId("childChildFacet"); + childChild.getFacets().put("facet", childChildFacet); + data = new UIData(); + renderKit.addRenderer(child.getFamily(), child.getRendererType(), new MockUIInputRenderer()); + renderKit.addRenderer(adaptor.getFamily(), adaptor.getRendererType(), new MockUIInputRenderer()); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + adaptor = null; + child = null; + childChild = null; + childChildFacet = null; + facetChild = null; + } + + private void createTree(){ + facesContext.getViewRoot().getChildren().add(adaptor); + adaptor.setId("adaptor"); + } + + private void createDataTree(){ + data.setId("data"); + adaptor.setId("adaptor"); + ArrayList value = new ArrayList(2); + value.add("first"); + value.add("second"); + data.setValue(value); + data.setVar("var"); + UIColumn column = new UIColumn(); + data.getChildren().add(column); + column.getChildren().add(adaptor); + facesContext.getViewRoot().getChildren().add(data); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#isRowAvailable()}. + */ + public void testIsRowAvailable() { + adaptor.setRowKey(new Integer(0)); + assertTrue(adaptor.isRowAvailable()); + adaptor.setRowKey(new Integer(MockDataModel.ROWS-1)); + assertTrue(adaptor.isRowAvailable()); + adaptor.setRowKey(new Integer(MockDataModel.ROWS+1)); + assertFalse(adaptor.isRowAvailable()); + adaptor.setRowKey(null); + assertFalse(adaptor.isRowAvailable()); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#getRowKey()}. + */ + public void testGetRowKey() { + adaptor.setRowIndex(0); + assertEquals(new Integer(0), adaptor.getRowKey()); + adaptor.setRowIndex(-1); + assertNull(adaptor.getRowKey()); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#setRowKey(java.lang.Object)}. + */ + public void testSetRowKey() { + adaptor.setRowKey(new Integer(1)); + assertEquals(1, adaptor.getRowIndex()); + adaptor.setRowKey(null); + assertEquals(-1, adaptor.getRowIndex()); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#resetDataModel()}. + */ + public void testResetDataModel() { + adaptor.setRowKey(new Integer(1)); + adaptor.resetDataModel(); + assertEquals(0, adaptor.getRowIndex()); + } + + public void testGetBaseClientId(){ + createDataTree(); + data.setRowIndex(-1); + assertEquals(adaptor.getBaseClientId(facesContext), "data:adaptor"); + data.setRowIndex(0); + assertEquals(adaptor.getBaseClientId(facesContext), "data:0:adaptor"); + data.setRowIndex(1); + assertEquals(adaptor.getBaseClientId(facesContext), "data:1:adaptor"); + adaptor.setRowIndex(1); + assertEquals(adaptor.getBaseClientId(facesContext), "data:1:adaptor"); + } + + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#setExtendedDataModel(org.ajax4jsf.ajax.repeat.ExtendedDataModel)}. + */ + public void testSetIterableDataModel() { + createDataTree(); + data.setRowIndex(0); + MockDataModel mockDataModel0 = new MockDataModel(); + adaptor.setExtendedDataModel(mockDataModel0); + data.setRowIndex(1); + MockDataModel mockDataModel1 = new MockDataModel(); + adaptor.setExtendedDataModel(mockDataModel1); + data.setRowIndex(0); + assertSame(mockDataModel0, adaptor.getExtendedDataModel()); + data.setRowIndex(1); + assertSame(mockDataModel1, adaptor.getExtendedDataModel()); + } + + public void testSetDataModel(){ + MockDataModel mockDataModel1 = new MockDataModel(); + adaptor.setExtendedDataModel(mockDataModel1); + assertSame(mockDataModel1, adaptor.getExtendedDataModel()); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#getExtendedDataModel()}. + */ + public void testGetIterableDataModel() { + ExtendedDataModel dataModel = adaptor.getExtendedDataModel(); + assertTrue(dataModel instanceof MockDataModel); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#getComponentState()}. + */ + public void testGetComponentState() { + createDataTree(); + data.setRowIndex(0); + DataComponentState state0 = adaptor.getComponentState(); + assertTrue(state0 instanceof MockComponentState); + data.setRowIndex(1); + DataComponentState state1 = adaptor.getComponentState(); + data.setRowIndex(0); + assertSame(state0, adaptor.getComponentState()); + data.setRowIndex(1); + assertSame(state1, adaptor.getComponentState()); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#createComponentState()}. + */ + public void testCreateComponentState() { + DataComponentState state = adaptor.createComponentState(); + assertTrue(state instanceof MockComponentState); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#iterate(javax.faces.context.FacesContext, org.ajax4jsf.ajax.repeat.RepeaterInvoker)}. + */ + public void testProcess() { + createTree(); + MockComponentState mockState = (MockComponentState) adaptor.getComponentState(); + mockState.setCount(4); + adaptor.processDecodes(facesContext); + assertEquals(childInvoked, 4); + assertEquals(facetInvoked, 1); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#iterate(javax.faces.context.FacesContext, org.ajax4jsf.ajax.repeat.RepeaterInvoker)}. + */ + public void testProcessMore() { + createTree(); + MockComponentState mockState = (MockComponentState) adaptor.getComponentState(); + mockState.setCount(Integer.MAX_VALUE); + adaptor.processDecodes(facesContext); + assertEquals(childInvoked, MockDataModel.ROWS); + assertEquals(facetInvoked, 1); + } + + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#restoreState(javax.faces.context.FacesContext, java.lang.Object)}. + * @throws IllegalAccessException + * @throws InstantiationException + */ + public void testRestoreStateFacesContextObject() throws Exception { + createTree(); + MockComponentState mockState = (MockComponentState) adaptor.getComponentState(); + mockState.setCount(123); + adaptor.encodeBegin(facesContext); + UIViewRoot viewRoot = facesContext.getViewRoot(); + Object treeState = viewRoot.processSaveState(facesContext); + UIViewRoot root = (UIViewRoot) viewRoot.getClass().newInstance(); + UIDataAdaptor restoredAdaptor = new MockDataAdaptor(); + root.getChildren().add(restoredAdaptor); + root.processRestoreState(facesContext, treeState); + mockState = (MockComponentState) restoredAdaptor.getComponentState(); + assertEquals(mockState.getCount(), 123); + } + + /** + * Test method for {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor#saveState(javax.faces.context.FacesContext)}. + */ + public void testSaveStateFacesContext() throws Exception { + createDataTree(); + data.setRowIndex(0); + MockComponentState mockState = (MockComponentState) adaptor.getComponentState(); + mockState.setCount(123); + adaptor.encodeBegin(facesContext); + data.setRowIndex(1); + mockState = (MockComponentState) adaptor.getComponentState(); + mockState.setCount(321); + adaptor.encodeBegin(facesContext); + UIViewRoot viewRoot = facesContext.getViewRoot(); + Object treeState = viewRoot.processSaveState(facesContext); + UIViewRoot root = (UIViewRoot) viewRoot.getClass().newInstance(); + UIData restoredData = new UIData(); + UIDataAdaptor restoredAdaptor = new MockDataAdaptor(); + root.getChildren().add(restoredData); + UIColumn column = new UIColumn(); + restoredData.getChildren().add(column); + column.getChildren().add(restoredAdaptor); + root.processRestoreState(facesContext, treeState); + restoredData.setRowIndex(0); + mockState = (MockComponentState) restoredAdaptor.getComponentState(); + assertEquals(mockState.getCount(), 123); + restoredData.setRowIndex(1); + mockState = (MockComponentState) restoredAdaptor.getComponentState(); + assertEquals(mockState.getCount(), 321); + } + + public void testSaveChildState(){ + createTree(); + child.setSubmittedValue("Submitted"); + child.setValid(true); + child.setValue("Value"); + child.setLocalValueSet(true); + adaptor.saveChildState(facesContext); + child.setSubmittedValue("NonSubmitted"); + child.setValid(false); + child.setValue(null); + child.setLocalValueSet(false); + adaptor.restoreChildState(facesContext); + assertEquals(child.getSubmittedValue(), "Submitted"); + assertTrue(child.isValid()); + assertEquals(child.getValue(), "Value"); + assertTrue(child.isLocalValueSet()); + } + + public void testSaveChildChildState(){ + createTree(); + childChild.setSubmittedValue("Submitted"); + childChild.setValid(true); + childChild.setValue("Value"); + childChild.setLocalValueSet(true); + adaptor.saveChildState(facesContext); + childChild.setSubmittedValue("NonSubmitted"); + childChild.setValid(false); + childChild.setValue(null); + childChild.setLocalValueSet(false); + adaptor.restoreChildState(facesContext); + assertEquals(childChild.getSubmittedValue(), "Submitted"); + assertTrue(childChild.isValid()); + assertEquals(childChild.getValue(), "Value"); + assertTrue(childChild.isLocalValueSet()); + } + public void testSaveChildChildFacetState(){ + createTree(); + childChildFacet.setSubmittedValue("Submitted"); + childChildFacet.setValid(true); + childChildFacet.setValue("Value"); + childChildFacet.setLocalValueSet(true); + adaptor.saveChildState(facesContext); + childChildFacet.setSubmittedValue("NonSubmitted"); + childChildFacet.setValid(false); + childChildFacet.setValue(null); + childChildFacet.setLocalValueSet(false); + adaptor.restoreChildState(facesContext); + assertEquals(childChildFacet.getSubmittedValue(), "Submitted"); + assertTrue(childChildFacet.isValid()); + assertEquals(childChildFacet.getValue(), "Value"); + assertTrue(childChildFacet.isLocalValueSet()); + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockComponentState.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockComponentState.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockComponentState.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,93 @@ +/** + * 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.ajax.repeat; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +/** + * @author shura + * + */ +public class MockComponentState implements DataComponentState,Serializable { + + /** + * + */ + private static final long serialVersionUID = -4278697745017092414L; + private int _count = 2; + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.DataComponentState#getRange() + */ + public Range getRange() { + // TODO Auto-generated method stub + return new MockRange(_count); + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#isTransient() + */ + public boolean isTransient() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#restoreState(javax.faces.context.FacesContext, java.lang.Object) + */ + public void restoreState(FacesContext context, Object state) { + _count = ((Integer)state).intValue(); + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#saveState(javax.faces.context.FacesContext) + */ + public Object saveState(FacesContext context) { + // TODO Auto-generated method stub + return new Integer(_count); + } + + /* (non-Javadoc) + * @see javax.faces.component.StateHolder#setTransient(boolean) + */ + public void setTransient(boolean newTransientValue) { + // TODO Auto-generated method stub + + } + + /** + * @return the count + */ + public int getCount() { + return _count; + } + + /** + * @param count the count to set + */ + public void setCount(int count) { + _count = count; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataAdaptor.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataAdaptor.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataAdaptor.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,64 @@ +/** + * 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.ajax.repeat; + +import java.util.Iterator; + +/** + * @author shura + * + */ +public class MockDataAdaptor extends UIDataAdaptor { + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#createComponentState() + */ + protected DataComponentState createComponentState() { + // TODO Auto-generated method stub + return new MockComponentState(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#createDataModel() + */ + protected ExtendedDataModel createDataModel() { + // TODO Auto-generated method stub + return new MockDataModel(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren() + */ + protected Iterator dataChildren() { + // TODO Auto-generated method stub + return getChildren().iterator(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#fixedChildren() + */ + protected Iterator fixedChildren() { + // TODO Auto-generated method stub + return getFacets().values().iterator(); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataModel.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataModel.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockDataModel.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,166 @@ +/** + * 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.ajax.repeat; + +import java.io.IOException; +import java.util.Iterator; + +import javax.faces.context.FacesContext; + +/** + * @author shura + * + */ +public class MockDataModel extends ExtendedDataModel { + + public static final int ROWS = 10; + + private int rowIndex = 0; + + private int minRow = 0; + + private int maxRow = ROWS; + + /** + * @return the maxRow + */ + public int getMaxRow() { + return maxRow; + } + + /** + * @param maxRow the maxRow to set + */ + public void setMaxRow(int maxRow) { + this.maxRow = maxRow; + } + + /** + * @return the minRow + */ + public int getMinRow() { + return minRow; + } + + /** + * @param minRow the minRow to set + */ + public void setMinRow(int minRow) { + this.minRow = minRow; + } + + + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException { + int first=0; + int count=ROWS; + if (range instanceof MockRange) { + MockRange mockRange = (MockRange) range; + count = mockRange.getCount(); + } else if (range instanceof SequenceRange) { + SequenceRange seqRange = (SequenceRange) range; + first = seqRange.getFirstRow(); + int rows = seqRange.getRows(); + if(rows>0){ + count = rows+first; + } + } + for(int row = first; row < count && row < ROWS;row++){ + visitor.process(context, new Integer(row), argument); + } + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#getRowKey() + */ + public Object getRowKey() { + // TODO Auto-generated method stub + return rowIndex<0?null:new Integer(rowIndex); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.ajax.repeat.ExtendedDataModel#setRowKey(java.lang.Object) + */ + public void setRowKey(Object key) { + if(null == key){ + rowIndex = -1; + } else { + rowIndex = ((Integer) key).intValue(); + } + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowCount() + */ + public int getRowCount() { + // TODO Auto-generated method stub + return getMaxRow(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowData() + */ + public Object getRowData() { + // TODO Auto-generated method stub + return isRowAvailable()?String.valueOf(rowIndex):null; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getRowIndex() + */ + public int getRowIndex() { + // TODO Auto-generated method stub + return rowIndex; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#getWrappedData() + */ + public Object getWrappedData() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#isRowAvailable() + */ + public boolean isRowAvailable() { + // TODO Auto-generated method stub + return rowIndex>=getMinRow() && rowIndex<getMaxRow(); + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setRowIndex(int) + */ + public void setRowIndex(int rowIndex) { + this.rowIndex = rowIndex; + } + + /* (non-Javadoc) + * @see javax.faces.model.DataModel#setWrappedData(java.lang.Object) + */ + public void setWrappedData(Object data) { + // TODO Auto-generated method stub + + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockRange.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockRange.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockRange.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,39 @@ +/** + * 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.ajax.repeat; + +/** + * @author shura + * + */ +public class MockRange implements Range { + + private int count; + + public MockRange(int count) { + this.count = count; + } + + public int getCount(){ + return count; + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockSerializableDataModel.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockSerializableDataModel.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/MockSerializableDataModel.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,96 @@ +/** + * 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.ajax.repeat; + +import java.io.IOException; + +import javax.faces.context.FacesContext; + +/** + * @author shura + * + */ +public class MockSerializableDataModel extends MockDataModel { + + public SerializableDataModel getSerializableModel(Range range) { + MockRange mockRange = (MockRange) range; + SerializableDataModel model = new SerializableDataModel(){ + + public void update() { + // TODO Auto-generated method stub + + } + + public Object getRowKey() { + // TODO Auto-generated method stub + return null; + } + + public void setRowKey(Object key) { + // TODO Auto-generated method stub + + } + + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) throws IOException { + // TODO Auto-generated method stub + + } + + public int getRowCount() { + // TODO Auto-generated method stub + return 0; + } + + public Object getRowData() { + // TODO Auto-generated method stub + return null; + } + + public int getRowIndex() { + // TODO Auto-generated method stub + return 0; + } + + public Object getWrappedData() { + // TODO Auto-generated method stub + return null; + } + + public boolean isRowAvailable() { + // TODO Auto-generated method stub + return false; + } + + public void setRowIndex(int arg0) { + // TODO Auto-generated method stub + + } + + public void setWrappedData(Object arg0) { + // TODO Auto-generated method stub + + } + + }; + return model; + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/RepeatTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/RepeatTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/RepeatTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,246 @@ +/** + * 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.ajax.repeat; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; +import javax.faces.component.UIData; +import javax.faces.component.UIInput; +import javax.faces.context.FacesContext; + +import org.ajax4jsf.renderkit.html.RepeatRenderer; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.MockUIInputRenderer; + +/** + * @author shura + * + */ +public class RepeatTestCase extends AbstractAjax4JsfTestCase { + + private UIRepeat repeater; + + private UIInput child; + + private int childInvoked; + + private UIInput facetChild; + + private int facetInvoked; + + private UIInput childChild; + + private int childChildInvoked; + + private UIInput childChildFacet; + + private int childChildFacetInvoked; + + private UIRepeat enclosedRepeater; + /** + * @param name + */ + public RepeatTestCase(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + // Create mock DataAdaptor and childs. + repeater = new UIRepeat(); + child = new UIInput(){ + public void processDecodes(FacesContext context) { + childInvoked++; + super.processDecodes(context); + } + }; + childInvoked = 0; + child.setId("child"); + repeater.getChildren().add(child); + facetChild = new UIInput(){ + public void processDecodes(FacesContext context) { + facetInvoked++; + super.processDecodes(context); + } + }; + facetInvoked = 0; + facetChild.setId("facetChild"); + repeater.getFacets().put("facet", facetChild); + childChild = new UIInput(){ + public void processDecodes(FacesContext context) { + childChildInvoked++; + super.processDecodes(context); + } + };; + childChildInvoked = 0; + childChild.setId("childChild"); + child.getChildren().add(childChild); + childChildFacet = new UIInput(){ + public void processDecodes(FacesContext context) { + childChildFacetInvoked++; + super.processDecodes(context); + } + };; + childChildFacetInvoked = 0; + childChildFacet.setId("childChildFacet"); + childChild.getFacets().put("facet", childChildFacet); + enclosedRepeater = new UIRepeat(); + renderKit.addRenderer(child.getFamily(), child.getRendererType(), new MockUIInputRenderer(){ + public void decode(FacesContext context, UIComponent component) { + super.decode(context, component); + UIInput input = (UIInput) component; + String submittedValie = enclosedRepeater.getRowKey()+":"+repeater.getRowKey(); + input.setSubmittedValue(submittedValie); + System.out.println("decode component "+component.getClientId(facesContext)+" with value "+submittedValie); + } + }); + renderKit.addRenderer(repeater.getFamily(), repeater.getRendererType(), new RepeatRenderer()); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + repeater = null; + child = null; + childChild = null; + childChildFacet = null; + facetChild = null; + enclosedRepeater = null; + } + + + private void createDataTree(){ + enclosedRepeater.setId("data"); + repeater.setId("adaptor"); + repeater.setVar("row"); + ArrayList value = new ArrayList(2); + value.add("first"); + value.add("second"); + enclosedRepeater.setValue(value); + enclosedRepeater.setVar("var"); + UIColumn column = new UIColumn(); + enclosedRepeater.getChildren().add(column); + column.getChildren().add(repeater); + facesContext.getViewRoot().getChildren().add(enclosedRepeater); + } + + private void printChildMap(Map childrenState){ + System.out.println("{"); + for (Iterator iter = childrenState.keySet().iterator(); iter.hasNext();) { + Object key = iter.next(); + System.out.println(" "+key+" : "+childrenState.get(key)); + } + System.out.println("}"); + } + /** + * Test method for {@link javax.faces.component.UIData#processDecodes(javax.faces.context.FacesContext)}. + */ + public void testProcessDecodesFacesContext() { + createDataTree(); + repeater.setValue(new MockDataModel()); +// enclosedRepeater.setValue(new MockDataModel()); + enclosedRepeater.processDecodes(facesContext); + enclosedRepeater.setRowIndex(1); + repeater.setRowIndex(1); + System.out.println("Saved child state for external repeater "); + printChildMap(enclosedRepeater.getChildState(facesContext)); + System.out.println("Saved child state" ); + printChildMap(repeater.getChildState(facesContext)); + assertEquals("1:1", child.getSubmittedValue()); + } + + /** + * Test method for {@link javax.faces.component.UIData#processUpdates(javax.faces.context.FacesContext)}. + */ + public void testProcessUpdatesFacesContext() { + createDataTree(); + repeater.setValue(new MockDataModel()); +// enclosedRepeater.setValue(new MockDataModel()); + enclosedRepeater.processDecodes(facesContext); + enclosedRepeater.processValidators(facesContext); + enclosedRepeater.processUpdates(facesContext); + enclosedRepeater.setRowIndex(1); + repeater.setRowIndex(1); + assertEquals("1:1", child.getValue()); + enclosedRepeater.setRowIndex(0); + repeater.setRowIndex(2); + assertEquals("0:2", child.getValue()); + } + + /** + * Test method for {@link javax.faces.component.UIData#processUpdates(javax.faces.context.FacesContext)}. + */ + public void testProcessValidatorsFacesContext() { + createDataTree(); + repeater.setValue(new MockDataModel()); +// enclosedRepeater.setValue(new MockDataModel()); + enclosedRepeater.processDecodes(facesContext); + enclosedRepeater.processValidators(facesContext); + enclosedRepeater.setRowIndex(1); + repeater.setRowIndex(1); + assertEquals("1:1", child.getLocalValue()); + enclosedRepeater.setRowIndex(0); + repeater.setRowIndex(2); + assertEquals("0:2", child.getLocalValue()); + } + + public void testSetRowIndex() throws Exception { + createDataTree(); + repeater.setValue(new MockDataModel()); + enclosedRepeater.setRowIndex(1); + repeater.setRowIndex(1); + child.setValue("1:1"); + repeater.setRowIndex(-1); + enclosedRepeater.setRowIndex(-1); + // ----------------------------- + enclosedRepeater.setRowIndex(0); + repeater.setRowIndex(2); + child.setValue("0:2"); + // ----------------------------- + repeater.setRowIndex(-1); + enclosedRepeater.setRowIndex(-1); + System.out.println("Saved child state for external repeater "); + printChildMap(enclosedRepeater.getChildState(facesContext)); + System.out.println("Saved child state" ); + printChildMap(repeater.getChildState(facesContext)); + // ----------------------------- + enclosedRepeater.setRowIndex(1); + repeater.setRowIndex(1); + assertEquals("1:1", child.getValue()); + repeater.setRowIndex(-1); + enclosedRepeater.setRowIndex(-1); + // ----------------------------- + enclosedRepeater.setRowIndex(0); + repeater.setRowIndex(2); + assertEquals("0:2", child.getValue()); + + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,88 @@ +/** + * 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.codec; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.util.base64.Codec; +import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; + +public class CodecTest extends AbstractThreadedAjax4JsfTestCase { + Codec c; + + public CodecTest(String s) { + super(s); + } + + public void setUp() throws Exception { + super.setUp(); + String message = ""; + try { + c = new Codec("anbshsquycwuudyft"); + } catch (Exception e) { + message = "Cannot create Codec instance " + e.getMessage(); + } + assertNotNull(message, c); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + + public void testCodec() { + CodecTestRunnable[] runnables = new CodecTestRunnable[100]; + for (int i = 0; i < runnables.length; i++) { + runnables[i] = new CodecTestRunnable(c, generateRandomString(), i); + } + runTestCaseRunnables(runnables); + } + + private String generateRandomString() { + StringBuffer ss = new StringBuffer(); + for (int i = 0; i < 50000; i++) { + char c = (char)(96 + Math.random() * 26); + ss.append(c); + } + return ss.toString(); + } + + class CodecTestRunnable extends TestCaseRunnable { + Codec c; + String s; + int id; + + public CodecTestRunnable(Codec c, String s, int id) { + this.c = c; + this.s = s; + this.id = id; + } + + + public void runTestCase(FacesContext context) throws Throwable { + String s1 = c.encode(s); + String s2 = c.decode(s1); + assertEquals("Failure in thread " + id, s2, s); + } + + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTestSuite.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTestSuite.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/codec/CodecTestSuite.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,36 @@ +/** + * 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.codec; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class CodecTestSuite { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.codec"); + suite.addTestSuite(CodecTest.class); + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/AllTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,39 @@ +/** + * 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.framework.ajax.xmlfilter; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.framework.ajax.xmlfilter"); + //$JUnit-BEGIN$ + suite.addTestSuite(CacheContentTest.class); + suite.addTestSuite(NekkoParserTest.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/CacheContentTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,123 @@ +/** + * 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.framework.ajax.xmlfilter; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.PrintWriter; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockPrintWriter; +import org.apache.shale.test.mock.MockServletOutputStream; + +/** + * @author shura + * + */ +public class CacheContentTest extends AbstractAjax4JsfTestCase { + + public CacheContentTest(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + } + + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + } + + + /** + * Test method for {@link org.ajax4jsf.framework.ajax.xmlfilter.CacheContent#getOutputStream(java.io.OutputStream)}. + * @throws IOException + */ + public void testGetOutputStream() throws IOException { + CacheContent content = new CacheContent(); + OutputStream outputStream = content.getOutputStream(); + byte[] bytes = "Test".getBytes(); + outputStream.write(bytes); + outputStream.flush(); + outputStream.close(); + ByteArrayOutputStream ser = new ByteArrayOutputStream(1024); + ObjectOutputStream objStream = new ObjectOutputStream(ser); + objStream.writeObject(content); + objStream.flush(); + ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray()); + ObjectInputStream objInput = new ObjectInputStream(in); + try { + content = (CacheContent) objInput.readObject(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + content.send(this.response); + MockServletOutputStream mockStream = (MockServletOutputStream) response.getOutputStream(); + byte[] bs = mockStream.content(); + assertEquals("Test", new String(bs)); + } + + /** + * Test method for {@link org.ajax4jsf.framework.ajax.xmlfilter.CacheContent#getWriter(java.io.Writer)}. + * @throws IOException + */ + public void testGetWriter() throws IOException { + CacheContent content = new CacheContent(); + PrintWriter outputStream = content.getWriter(); + outputStream.write("Test"); + outputStream.flush(); + outputStream.close(); + ByteArrayOutputStream ser = new ByteArrayOutputStream(1024); + ObjectOutputStream objStream = new ObjectOutputStream(ser); + objStream.writeObject(content); + objStream.flush(); + ByteArrayInputStream in = new ByteArrayInputStream(ser.toByteArray()); + ObjectInputStream objInput = new ObjectInputStream(in); + try { + content = (CacheContent) objInput.readObject(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + content.send(this.response); + MockPrintWriter writer = (MockPrintWriter) response.getWriter(); + char[] cs = writer.content(); + assertEquals("Test", new String(cs)); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,91 @@ +/** + * 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.framework.ajax.xmlfilter; + +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; + +import junit.framework.TestCase; + +import org.ajax4jsf.framework.ajax.xmlfilter.nekko.NekkoParser; + +public class NekkoParserTest extends TestCase { + + private NekkoParser parser; + + protected void setUp() throws Exception { + parser = new NekkoParser(); + parser.setInputEncoding("UTF-8"); + parser.setOutputEncoding("UTF-8"); + super.setUp(); + } + + protected void tearDown() throws Exception { + parser = null; + super.tearDown(); + } + + /* + * Test method for 'org.ajax4jsf.framework.ajax.xmlfilter.NekkoParser.parseHtml(Reader, Writer)' + */ + public void testParseHtmlReaderWriter() { + String html = "<html><body><table><tr><td>xxx</td></tr></table></body></html>"; + ParseString(html); + } + + public void testParseHtmlReaderWriter1() { + String html = "<html><body><table><tr><td>xxx</td></tr><tr><td>xxx</td></tr></table></body></html>"; + ParseString(html); + } + public void testParseHtmlReaderWriter2() { + String html = "<html><body><table><tbody><tr><td>xxx</td></tr><tr><td>xxx</td></tr></tbody></table></body></html>"; + ParseString(html); + } + public void testParseHtmlReaderWriter3() { + String html = "<html><body><table><thead><tr><td>xxx</td></tr></thead><tr><td>xxx</td></tr></table></body></html>"; + ParseString(html); + } + public void testParseHtmlReaderWriter4() { + String html = "<html><body><table><span><tr><td>xxx</td></tr><tr><td>xxx</td></tr></span></table></body></html>"; + ParseString(html); + } + /** + * @param html + */ + private String ParseString(String html) { + Reader in = new StringReader(html); + StringWriter out = new StringWriter(); + try { + parser.parseHtml(in,out); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + assertTrue("Io error in parser ",false); + } + String toString = out.toString(); + System.out.println(toString); + return toString; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,95 @@ +/** + * 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.framework.renderer; + +import javax.faces.component.UIComponent; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; +import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; +import org.ajax4jsf.renderkit.html.CommandButtonRenderer; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:09 $ + * + */ +public class BeforeRendererListenerTestCase extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public BeforeRendererListenerTestCase(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + /* + * @see VcpJsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + FilterServletResponseWrapper responseWrapper = new FilterServletResponseWrapper(response); + request.setAttribute(BaseFilter.RESPONSE_WRAPPER_ATTRIBUTE, responseWrapper ); + } + + /* + * @see VcpJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.afterPhase(PhaseEvent)' + */ + public void testAfterPhase() throws Exception { + PhaseListener listener = new AjaxPhaseListener(); + PhaseEvent event = new PhaseEvent(facesContext,PhaseId.RENDER_RESPONSE,lifecycle); + UIComponent ajaxButton = createComponent("org.ajax4jsf.ajax.AjaxButton", "org.ajax4jsf.ajax.html.HtmlAjaxCommandButton", "org.ajax4jsf.ajax.AjaxButton", CommandButtonRenderer.class, null); + facesContext.getViewRoot().getChildren().add(ajaxButton); + AjaxContext.getCurrentInstance(facesContext).setAjaxRequest(true); + // TODO Must be used different StateManager ! +// listener.afterPhase(event); +// assertNotNull(externalContext.getRequestMap().get(AjaxPhaseListener.VIEW_STATE_SAVED_PARAM)); +// assertNull(externalContext.getRequestMap().get(AjaxContext.STYLES_PARAMETER)); + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.beforePhase(PhaseEvent)' + */ + public void testBeforePhase() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.BeforeRenderListener.isValueReference(String)' + */ + public void testIsValueReference() { + + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/ChameleonRenderKitImplTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,76 @@ +/** + * 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.framework.renderer; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:09 $ + * + */ +public class ChameleonRenderKitImplTestCase extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public ChameleonRenderKitImplTestCase(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + /* + * @see VcpJsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* + * @see VcpJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.addRenderer(String, String, Renderer)' + */ + public void testAddRendererStringStringRenderer() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.getRenderer(String, String)' + */ + public void testGetRendererStringString() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl.getDefaultRenderKit()' + */ + public void testGetDefaultRenderKit() { + + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/renderer/RenderTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,44 @@ +/** + * 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.framework.renderer; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:10 $ + * + */ +public class RenderTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.framework.renderer"); + //$JUnit-BEGIN$ + suite.addTestSuite(ChameleonRenderKitImplTestCase.class); + suite.addTestSuite(BeforeRendererListenerTestCase.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/AllResourcesTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,45 @@ +/** + * 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.framework.resource; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:10 $ + * + */ +public class AllResourcesTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.framework.resource"); + //$JUnit-BEGIN$ + suite.addTestSuite(ResourceServiceThreadsTestCase.class); + suite.addTestSuite(InternetResourceServiceTestCase.class); + suite.addTestSuite(CSSTemplateTestCase.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,185 @@ +/** + * 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.framework.resource; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +import org.ajax4jsf.framework.renderer.compiler.TemplateContext; +import org.ajax4jsf.framework.skin.SkinFactory; +import org.ajax4jsf.framework.util.config.WebXml; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockPrintWriter; + +/** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:10 $ + * + */ +public class CSSTemplateTestCase extends AbstractAjax4JsfTestCase { + + private static boolean methodCalled=false; + + private static boolean methodParamOk=false; + + /** + * Constructor for CSSTemplateTestCase. + * @param name + */ + public CSSTemplateTestCase(String name) { + super(name); + } + + /* + * @see VcpJsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + CSSTemplateTestCase.methodCalled=false; + CSSTemplateTestCase.methodParamOk=false; + } + + /* + * @see VcpJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + public void testCallWithContext() throws Exception { + String templatePath = "org/ajax4jsf/framework/resource/call.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + assertTrue(methodCalled); + } + + public static void contextCallWithParam(TemplateContext context,String param) { + methodCalled = true; + methodParamOk = "Test".equals(param); + } + + public void testCallWithContextAndParam() throws Exception { + String templatePath = "org/ajax4jsf/framework/resource/callWithParam.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + assertTrue(methodCalled); + } + + public static void contextCall(TemplateContext context) { + methodCalled = true; + } + /* + * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.send(ResourceContext)' + */ + public void testSend() throws IOException { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + try { + resource.send(context); + } catch (IOException e) { + assertTrue("error send style",false); + } + MockPrintWriter printWriter = (MockPrintWriter) response.getWriter(); + String content = String.valueOf(printWriter.content()); + System.out.println(content); + } + + /* + * Test method for 'org.ajax4jsf.framework.resource.TemplateCSSResource.TemplateCSSResource(String)' + */ + public void testTemplateCSSResource() throws IOException { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + assertEquals(templatePath,resource.getKey()); + InternetResource resource2 = InternetResourceBuilder.getInstance().createResource(this,resource.getKey()); + ResourceContext ctx = new FacesResourceContext(this.facesContext); + InputStream stream = resource.getResourceAsStream(ctx); + byte[] resourceContent = new byte[8196]; + int length = stream.read(resourceContent); + InputStream stream2 = resource2.getResourceAsStream(ctx); + byte[] resource2Content = new byte[8196]; + int length2 = stream2.read(resource2Content); + assertEquals(length, length2); + + } + + /* + * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.isCacheable()' + */ + public void testIsCacheable() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getContentType()' + */ + public void testGetContentType() { + + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + assertEquals("text/css",resource.getContentType(null)); +} + + /* + * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getUri(FacesContext, Object)' + */ + public void testGetUri() { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); +// System.out.println(resource.getUri(facesContext,null)); + String expextedUri = request.getContextPath()+"/"+WebXml.RESOURCE_URI_PREFIX+resource.getKey(); +// System.out.println(expextedUri); + assertTrue(resource.getUri(facesContext,null).startsWith(expextedUri)); + } + + /* + * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.getResourceAsStream(ResourceContext)' + */ + public void testGetResourceAsStream() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.resource.InternetResourceBase.sendHeaders(ResourceContext)' + */ + public void testSendHeaders() { + String templatePath = "org/ajax4jsf/framework/resource/styles.xml"; + TemplateCSSResource resource = new TemplateCSSResource(templatePath); + ResourceContext context = new FacesResourceContext(facesContext); + resource.sendHeaders(context); + String header = response.getContentType(); + assertNotNull(header); + assertTrue(header.startsWith("text/css")); + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,160 @@ +/** + * 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.framework.resource; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockServletOutputStream; + +import com.gargoylesoftware.htmlunit.Page; + +/** + * @author shura + * + */ +public class InternetResourceServiceTestCase extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public InternetResourceServiceTestCase(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + InternetResourceBuilder.setInstance(null); + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#init(javax.servlet.FilterConfig)}. + * @throws Exception + */ + public void testInit() throws Exception { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + assertSame(servletContext, service.getServletContext()); + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testServiceResource() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, "test.js"); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "\nfunction Test(){};"); + response.setOutputStream(null); + response.setWriter(null); + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testCachedServiceResource() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + for(int i=1;i<=10;i++){ + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + assertEquals(((MockCacheableResource) resource).getCounter(), 1); + response.setOutputStream(null); + response.setWriter(null); + } + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#serviceResource(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. + * @throws IOException + * @throws Exception + */ + public void testCachedServiceExpiration() throws Exception, IOException { + InternetResourceService service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + InternetResource resource = builder.createResource(this, MockCacheableResource.class.getName()); + MockResourceRequest resourceRequest = new MockResourceRequest(request); + String key = resource.getKey(); + for(int j=1;j<=10;j++){ + for(int i=1;i<=10;i++){ + request.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), String.valueOf(i)); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + response.setOutputStream(null); + response.setWriter(null); + } + } + int counter = ((MockCacheableResource) resource).getCounter(); + assertTrue("Resource was generated "+counter+" times", counter<= 10); + } + + public void testSendResource() { +// fail("Not yet implemented"); + } + + /** + * Test method for {@link org.ajax4jsf.framework.resource.InternetResourceService#getProperties(java.lang.String)}. + */ + public void testGetProperties() { +// fail("Not yet implemented"); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockCacheableResource.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,59 @@ +/** + * 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.framework.resource; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +/** + * @author shura + * + */ +public class MockCacheableResource extends InternetResourceBase { + + private int counter = 0; + + public int getCounter() { + return counter; + } + + /** + * + */ + public MockCacheableResource() { + super(); + setRenderer(new LogfileRenderer()); + setCacheable(true); + } + + public InputStream getResourceAsStream(ResourceContext context) { + counter++; + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return new ByteArrayInputStream("test".getBytes()); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockFilterConfig.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,98 @@ +/** + * 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.framework.resource; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; + +/** + * @author shura + * + */ +public class MockFilterConfig implements FilterConfig { + + private ServletContext servletContext; + + private Map initParameters = new HashMap(); + + /** + * @param servletContext + */ + public MockFilterConfig(ServletContext servletContext) { + super(); + this.servletContext = servletContext; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getFilterName() + */ + public String getFilterName() { + // TODO Auto-generated method stub + return "A4J"; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String) + */ + public String getInitParameter(String arg0) { + // TODO Auto-generated method stub + return (String) initParameters.get(arg0); + } + + public void setInitParameter(String name, String value) { + initParameters.put(name, value); + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getInitParameterNames() + */ + public Enumeration getInitParameterNames() { + final Iterator parametersIterator = initParameters.keySet().iterator(); + return new Enumeration(){ + + public boolean hasMoreElements() { + // TODO Auto-generated method stub + return parametersIterator.hasNext(); + } + + public Object nextElement() { + // TODO Auto-generated method stub + return parametersIterator.next(); + } + + }; + } + + /* (non-Javadoc) + * @see javax.servlet.FilterConfig#getServletContext() + */ + public ServletContext getServletContext() { + // TODO Auto-generated method stub + return servletContext; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,62 @@ +/** + * 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.framework.resource; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Map; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; + +import org.apache.shale.test.mock.MockHttpServletRequest; + +/** + * @author shura + * + */ +public class MockResourceRequest extends HttpServletRequestWrapper { + + private String method; + + public MockResourceRequest(HttpServletRequest mockRequest) { + super(mockRequest); + method = "GET"; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ParametersEncodingTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,47 @@ +package org.ajax4jsf.framework.resource; + +import java.util.Arrays; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +public class ParametersEncodingTestCase extends AbstractAjax4JsfTestCase { + + private ResourceBuilderImpl builder; + + private byte[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 }; + + public ParametersEncodingTestCase(String arg0) { + super(arg0); + } + + public void setUp() throws Exception { + super.setUp(); + builder = new ResourceBuilderImpl(); + } + + public void tearDown() throws Exception { + builder = null; + super.tearDown(); + } + + public final void testEncrypt() { + byte[] bs = builder.encrypt(data); + byte[] bs2 = builder.decrypt(bs); + assertTrue(Arrays.equals(data, bs2)); + } + + public final void testDecryptLeak() { + byte[] bs = {}; + for (int i = 0; i < 10000; i++) { + bs = builder.encrypt(data); + + } + byte[] bs2={}; + for (int i = 0; i < 10000; i++) { + bs2 = builder.decrypt(bs); + + } + assertTrue(Arrays.equals(data, bs2)); + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,110 @@ +/** + * 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.framework.resource; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.framework.skin.SkinThreadsTestCase.SkinTestRunnable; +import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; +import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase.TestCaseRunnable; +import org.apache.shale.test.mock.MockHttpServletRequest; +import org.apache.shale.test.mock.MockHttpServletResponse; +import org.apache.shale.test.mock.MockServletOutputStream; + +/** + * @author shura + * + */ +public class ResourceServiceThreadsTestCase extends AbstractThreadedAjax4JsfTestCase { + + /** + * @param s + */ + public ResourceServiceThreadsTestCase(String s) { + super(s); + // TODO Auto-generated constructor stub + } + + InternetResourceService service; + String key; + InternetResource resource; + + public void setUp() throws Exception { + super.setUp(); + service = new InternetResourceService(); + MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext); + mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true"); + service.init(mockFilterConfig); + InternetResourceBuilder builder = InternetResourceBuilder.getInstance(); + resource = builder.createResource(this, MockCacheableResource.class.getName()); + key = resource.getKey(); + } + + public void tearDown() throws Exception { + super.tearDown(); + InternetResourceBuilder.setInstance(null); + resource = null; + service = null; + key=null; + } + + public class ResourceRunner extends TestCaseRunnable { + + private String data; + + + /** + * @param data + */ + public ResourceRunner(String data) { + super(); + this.data = data; + } + + + public void runTestCase(FacesContext context) throws Throwable { + MockHttpServletResponse response = new MockHttpServletResponse(); + MockHttpServletRequest req = new MockHttpServletRequest(session); + req.setServletContext(servletContext); + req.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), data); + MockResourceRequest resourceRequest = new MockResourceRequest(req); + service.serviceResource(key,resourceRequest,response); + byte[] content = ((MockServletOutputStream)response.getOutputStream()).content(); + String strContent = new String(content); + assertEquals(strContent, "test"); + + } + + } + + public void testTreadServiceResource() { + TestCaseRunnable[] runnables = new TestCaseRunnable[1000]; + for (int i = 0; i < runnables.length; i++) { + runnables[i] = new ResourceRunner(String.valueOf(i%10)); + + } + this.runTestCaseRunnables(runnables); + int counter = ((MockCacheableResource) resource).getCounter(); + assertTrue("Resource was generated "+counter+" times", counter<= 10); + + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/Bean.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/Bean.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/Bean.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,27 @@ +/** + * 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.framework.skin; + +public class Bean { + public String getName(){return "bindedtest";} + public String getBean(){return "binded.string";} +} \ No newline at end of file Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,326 @@ +/** + * 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.framework.skin; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.faces.FacesException; +import javax.faces.FactoryFinder; +import javax.faces.application.Application; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; + +import junit.framework.TestCase; + +import org.easymock.MockControl; +import org.easymock.classextension.MockClassControl; + +/** + * Test for Skin/skin factory methods. + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/10 14:28:13 $ + * + */ +public class SkinTestCase extends TestCase { + private MockControl contextControl; + private FacesContext mockContext; + + private MockControl externalContextControl; + private ExternalContext mockExternalContext; + + private TestApplicationFactory appFactory; + + private MockControl bindingControl; + private ValueBinding mockBinding; + private MockControl bindingSkinControl; + private ValueBinding mockSkinBinding; + + public SkinTestCase(String name) { + super(name); + } + + protected void setUp() throws Exception { + contextControl = MockClassControl.createControl(FacesContext.class); + mockContext = (FacesContext) contextControl.getMock(); + externalContextControl = MockClassControl.createControl(ExternalContext.class); + mockExternalContext = (ExternalContext) externalContextControl.getMock(); + bindingControl = MockClassControl.createNiceControl(ValueBinding.class); + mockBinding = (ValueBinding) bindingControl.getMock(); + bindingSkinControl = MockClassControl.createNiceControl(ValueBinding.class); + mockSkinBinding = (ValueBinding) bindingSkinControl.getMock(); + FactoryFinder.releaseFactories(); + FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, TestApplicationFactory.class.getName()); + appFactory = (TestApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY); + super.setUp(); + } + + protected void tearDown() throws Exception { + FactoryFinder.releaseFactories(); + SkinFactory.reset(); + super.tearDown(); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getInstance()' + */ + public void testGetInstance() { + SkinFactory factory = SkinFactory.getInstance(); + SkinFactory factory1 = SkinFactory.getInstance(); + assertSame(factory,factory1); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + */ + public void testGetSkin() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setReturnValue(mockExternalContext); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("test"); + externalContextControl.replay(); + // setup Application mock + Application app = appFactory.getApplication(); + app.createValueBinding("#{test.bean}"); + appFactory.getApplicationControl().setReturnValue(mockBinding); + appFactory.getApplicationControl().replay(); + // setup Value binding mock. + mockBinding.getValue(mockContext); + bindingControl.setReturnValue("test.value"); + mockBinding.getValue(mockContext); + bindingControl.setReturnValue("test.value1"); + bindingControl.setDefaultReturnValue("test.value"); + bindingControl.replay(); + // test call + Skin skin = factory.getSkin(mockContext); + // calls control + contextControl.verify(); + externalContextControl.verify(); + appFactory.getApplicationControl().verify(); + assertNotNull("Null skin!",skin); + // test properties + assertEquals("string",skin.getParameter(mockContext,"string.property")); + assertEquals("base.string",skin.getParameter(mockContext,"base.property")); + assertEquals("test.value",skin.getParameter(mockContext,"bind.property")); +// assertEquals("HTML_BASIC",skin.getRenderKitId(mockContext)); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + */ + public void testSkinReferences() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setReturnValue(mockExternalContext); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("test"); + externalContextControl.replay(); + // setup Application mock + Application app = appFactory.getApplication(); + app.createValueBinding("#{test.bean}"); + appFactory.getApplicationControl().setReturnValue(mockBinding); + appFactory.getApplicationControl().replay(); + // setup Value binding mock. + mockBinding.getValue(mockContext); + bindingControl.setReturnValue("test.value"); + mockBinding.getValue(mockContext); + bindingControl.setReturnValue("test.value1"); + bindingControl.setDefaultReturnValue("test.value"); + bindingControl.replay(); + // test call + Skin skin = factory.getSkin(mockContext); + // calls control + contextControl.verify(); + externalContextControl.verify(); + appFactory.getApplicationControl().verify(); + assertNotNull("Null skin!",skin); + assertEquals("default",skin.getParameter(mockContext,"c")); + assertEquals("yyy",skin.getParameter(mockContext,"y")); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + */ + public void testCyclicSkinReferences() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setReturnValue(mockExternalContext); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("cyclic"); + externalContextControl.replay(); + // test call + try { + Skin skin = factory.getSkin(mockContext); + } catch(FacesException e){ + return; + } + assertTrue(false); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + */ + public void testBadSkinReferences() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setReturnValue(mockExternalContext); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("noref"); + externalContextControl.replay(); + // test call + try { + Skin skin = factory.getSkin(mockContext); + } catch(FacesException e){ + return; + } + assertTrue(false); + } + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkin(FacesContext)' + */ + public void testGetBindedSkin() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setReturnValue(mockExternalContext); + mockContext.getApplication(); + contextControl.setReturnValue(appFactory.getApplication()); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("#{test.skin}"); + externalContextControl.replay(); + // setup Application mock + Application app = appFactory.getApplication(); + app.createValueBinding("#{test.skin}"); + appFactory.getApplicationControl().setReturnValue(mockSkinBinding); + app.createValueBinding("#{test.bean}"); + appFactory.getApplicationControl().setReturnValue(mockBinding); + appFactory.getApplicationControl().replay(); + // setup Value binding mock. + mockBinding.getValue(mockContext); + bindingControl.setReturnValue("binded.test.value"); + bindingControl.replay(); + // skin EL binding. + mockSkinBinding.getValue(mockContext); + bindingSkinControl.setDefaultReturnValue("bindedtest"); + bindingSkinControl.replay(); + // test call + Skin skin = factory.getSkin(mockContext); + assertNotNull("Null skin!",skin); + // test properties + assertEquals("bindedstring",skin.getParameter(mockContext,"string.property")); +// assertEquals("base.string",skin.getParameter(mockContext,"base.property")); + assertEquals("binded.test.value",skin.getParameter(mockContext,"bind.property")); + assertEquals("TEST",skin.getRenderKitId(mockContext)); + + + // calls control +// contextControl.verify(); +// externalContextControl.verify(); +// appFactory.getApplicationControl().verify(); +// bindingControl.verify(); +// bindingSkinControl.verify(); +} + + public void testSkinHash() { + SkinFactory factory = SkinFactory.getInstance(); + // setup context mock + mockContext.getExternalContext(); + contextControl.setDefaultReturnValue(mockExternalContext); + mockContext.getApplication(); + contextControl.setReturnValue(appFactory.getApplication()); + contextControl.replay(); + // setup External context mock + mockExternalContext.getInitParameter(SkinFactory.SKIN_PARAMETER); + externalContextControl.setReturnValue("#{test.skin}"); + Map params = new HashMap(); + mockExternalContext.getRequestMap(); + externalContextControl.setDefaultReturnValue(params); + externalContextControl.replay(); + // setup Application mock + Application app = appFactory.getApplication(); + app.createValueBinding("#{test.skin}"); + appFactory.getApplicationControl().setReturnValue(mockSkinBinding); + app.createValueBinding("#{test.bean}"); + appFactory.getApplicationControl().setReturnValue(mockBinding); + appFactory.getApplicationControl().replay(); + // setup Value binding mock. + mockBinding.getValue(mockContext); + bindingControl.setDefaultReturnValue("binded.test.value"); + bindingControl.replay(); + // skin EL binding. + mockSkinBinding.getValue(mockContext); + bindingSkinControl.setDefaultReturnValue("bindedtest"); + bindingSkinControl.replay(); + // test call + Skin skin = factory.getSkin(mockContext); + assertNotNull("Null skin!",skin); + // test properties + int hash = skin.hashCode(mockContext); + assertTrue(params.containsKey(SkinImpl.REQUEST_HASH_CODE_PARAMETER)); + assertEquals(hash,skin.hashCode(mockContext)); + params.clear(); + assertEquals(hash,skin.hashCode(mockContext)); + // setup Value binding mock for different value - hash must differ. + params.clear(); + bindingControl.reset(); + mockBinding.getValue(mockContext); + bindingControl.setDefaultReturnValue("other.test.value"); + bindingControl.replay(); + assertFalse( hash==skin.hashCode(mockContext) ); + + } + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getDefaultProperties()' + */ + public void testGetDefaultProperties() { + SkinFactoryImpl factory = (SkinFactoryImpl) SkinFactory.getInstance(); + Properties defaultProps = factory.getDefaultSkinProperties(); +// assertEquals("HTML_BASIC",defaultProps.getProperty("render.kit")); + // Second default config + assertEquals("default",defaultProps.getProperty("a")); + } + + /* + * Test method for 'org.ajax4jsf.framework.skin.SkinFactory.getSkinName(FacesContext)' + */ + public void testGetSkinName() { + + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,39 @@ +/** + * 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.framework.skin; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class SkinTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.framework.skin"); + //$JUnit-BEGIN$ + suite.addTestSuite(SkinThreadsTestCase.class); + suite.addTestSuite(SkinTestCase.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/SkinThreadsTestCase.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,110 @@ +/** + * 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.framework.skin; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:11 $ + * + */ +public class SkinThreadsTestCase extends AbstractThreadedAjax4JsfTestCase { + + /** + * @param s + */ + public SkinThreadsTestCase(String s) { + super(s); + // TODO Auto-generated constructor stub + } + + /* + * (non-Javadoc) + * + * @see com.exadel.vcp.tests.VcpJsfTestCase#setUp() + */ +public void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + servletContext.setAttribute("skin", new Bean()); + } + /* + * (non-Javadoc) + * + * @see com.exadel.vcp.tests.VcpJsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + } + + + public class SkinTestRunnable extends TestCaseRunnable { + + + /** + * + */ + public SkinTestRunnable() { + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see com.exadel.vcp.tests.ThreadedVcpJsfTestCase.TestCaseRunnable#runTestCase(javax.faces.context.FacesContext) + */ + public void runTestCase(FacesContext context) throws Throwable { + context.getExternalContext().getRequestMap().put("test", new Bean()); + Skin skin = SkinFactory.getInstance().getSkin(context); + assertNotNull(skin); + assertEquals("TEST", skin.getRenderKitId(context)); + assertEquals("binded.string", skin.getParameter(context, "bind.property")); + assertEquals("bindedstring", skin.getParameter(context, "string.property")); + assertEquals("10", skin.getParameter(context, "int.property")); + assertNull(skin.getParameter(context, "notexist")); + } + + } + + /** + * Test skin factory for thread-safe. + */ + public void testThreadsafe() { + TestCaseRunnable[] runnables = new TestCaseRunnable[20]; + for (int i = 0; i < runnables.length; i++) { + runnables[i] = new SkinTestRunnable(); + + } + this.runTestCaseRunnables(runnables); + } + /* + * (non-Javadoc) + * + * @see com.exadel.vcp.tests.VcpJsfTestCase#getSkinName() + */ + protected String getSkinName() { + // TODO Auto-generated method stub + return "#{skin.name}"; + } +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/TestApplicationFactory.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/TestApplicationFactory.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/skin/TestApplicationFactory.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,115 @@ +/** + * 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.framework.skin; + + + +import javax.faces.application.Application; + +import javax.faces.application.ApplicationFactory; + + + +import org.easymock.MockControl; + +import org.easymock.classextension.MockClassControl; + + + +/** + + * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) + + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/20 20:58:11 $ + + * + + */ + +public class TestApplicationFactory extends ApplicationFactory { + + + + private MockControl applicationControl; + + private Application mockApplication; + + + + public TestApplicationFactory(){ + + applicationControl = MockClassControl.createControl(Application.class); + + mockApplication = (Application) applicationControl.getMock(); + + } + + + + /* (non-Javadoc) + + * @see javax.faces.application.ApplicationFactory#getApplication() + + */ + + public Application getApplication() { + + // TODO Auto-generated method stub + + return mockApplication; + + } + + + + /* (non-Javadoc) + + * @see javax.faces.application.ApplicationFactory#setApplication(javax.faces.application.Application) + + */ + + public void setApplication(Application arg0) { + + // TODO Auto-generated method stub + + + + } + + + + /** + + * @return Returns the applicationControl. + + */ + + public MockControl getApplicationControl() { + + return applicationControl; + + } + + + +} + Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/AllTests.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/AllTests.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/AllTests.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,38 @@ +/** + * 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.framework.util.config; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTests { + + public static Test suite() { + TestSuite suite = new TestSuite( + "Test for org.ajax4jsf.framework.util.config"); + //$JUnit-BEGIN$ + suite.addTestSuite(WebXmlTest.class); + //$JUnit-END$ + return suite; + } + +} Added: branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/WebXmlTest.java =================================================================== --- branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/WebXmlTest.java (rev 0) +++ branches/refactor1/framework/test/src/test/java/org/ajax4jsf/framework/util/config/WebXmlTest.java 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,120 @@ +/** + * 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.framework.util.config; + +import java.io.InputStream; + +import javax.servlet.ServletException; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.apache.shale.test.mock.MockServletContext; + +public class WebXmlTest extends AbstractAjax4JsfTestCase { + + MockServletContext context; + + public WebXmlTest(String arg0) { + super(arg0); + } + + public void setUp() throws Exception { + super.setUp(); + context = new MockServletContext(){ + + /* (non-Javadoc) + * @see org.apache.shale.test.mock.MockServletContext#getResourceAsStream(java.lang.String) + */ + public InputStream getResourceAsStream(String uri) { + if(uri.equals(WebXml.WEB_XML)){ + return this.getClass().getResourceAsStream("/WEB-INF/complex-web.xml"); + } else { + return super.getResourceAsStream(uri); + } + } + + }; + } + + public void tearDown() throws Exception { + super.tearDown(); + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.reset()' + */ + public void testReset() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.init(ServletContext, String)' + */ + public void testInit() throws ServletException { + WebXml webXml = new WebXml(); + webXml.init(context,"ajax4jsf"); + assertFalse(webXml.isPrefixMapping()); + assertNull(webXml.getFacesFilterPrefix()); + assertNotNull(webXml.getFacesFilterSuffix()); + assertEquals(".jsf",webXml.getFacesFilterSuffix()); + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.getInstance()' + */ + public void testGetInstance() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.getFacesResourceURL(FacesContext, String)' + */ + public void testGetFacesResourceURL() throws ServletException { + WebXml webXml = new WebXml(); + webXml.init(context,"ajax4jsf"); + String resourceURL = webXml.getFacesResourceURL(facesContext,"foo.Bar"); + System.out.println(resourceURL); + assertEquals("/testContext/"+WebXml.RESOURCE_URI_PREFIX+"foo.Bar.jsf",resourceURL); + + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.getFacesResourceKey(HttpServletRequest)' + */ + public void testGetFacesResourceKey() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.isFacesRequest(HttpServletRequest)' + */ + public void testIsFacesRequest() { + + } + + /* + * Test method for 'org.ajax4jsf.framework.util.config.WebXml.setFilterName(String)' + */ + public void testSetFilterName() { + + } + +} Added: branches/refactor1/framework/test/src/test/resources/META-INF/skins/DEFAULT.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/META-INF/skins/DEFAULT.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/META-INF/skins/DEFAULT.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,11 @@ +customFormColor=#F5F0E7 +a=default + +b=&a + +c=&b + +x=xxx + +y=&x + Added: branches/refactor1/framework/test/src/test/resources/META-INF/skins/cyclic.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/META-INF/skins/cyclic.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/META-INF/skins/cyclic.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,4 @@ +base.property=base.string + +x=&x + Added: branches/refactor1/framework/test/src/test/resources/META-INF/skins/noref.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/META-INF/skins/noref.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/META-INF/skins/noref.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,4 @@ +base.property=base.string + +x=&z + Added: branches/refactor1/framework/test/src/test/resources/META-INF/skins/style.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/META-INF/skins/style.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/META-INF/skins/style.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,3 @@ +generalStyleSheet=resource\://skin/style.xcss +intermediateTextColor=&customFormColor +generalTextColor=&intermediateTextColor \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/META-INF/skins/test.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/META-INF/skins/test.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/META-INF/skins/test.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,4 @@ +base.property=base.string + +x=yyy + Added: branches/refactor1/framework/test/src/test/resources/WEB-INF/complex-web.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/WEB-INF/complex-web.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/WEB-INF/complex-web.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,328 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + + <display-name>Flex Enterprise Services</display-name> + <description>Flex Enterprise Services Application</description> + + <context-param> + <param-name>flex.class.path</param-name> + <param-value>/WEB-INF/flex/hotfixes,/WEB-INF/flex/jars</param-value> + </context-param> + + + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + <description>Comma separated list of URIs of (additional) faces config files. + (e.g. /WEB-INF/my-config.xml) + See JSF 1.0 PRD2, 10.3.2</description> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + <description>State saving method: "client" or "server" (= default) + See JSF Specification 2.5.2</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> + <param-value>true</param-value> + <description>This parameter tells MyFaces if javascript code should be allowed in the + rendered HTML output. + If javascript is allowed, command_link anchors will have javascript code + that submits the corresponding form. + If javascript is not allowed, the state saving info and nested parameters + will be added as url parameters. + Default: "true"</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.PRETTY_HTML</param-name> + <param-value>true</param-value> + <description>If true, rendered HTML code will be formatted, so that it is "human readable". + i.e. additional line separators and whitespace will be written, that do not + influence the HTML code. + Default: "true"</description> + </context-param> + <context-param> + <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> + <param-value>true</param-value> + <description>If true, a javascript function will be rendered that is able to restore the + former vertical scroll on every request. Convenient feature if you have pages + with long lists and you do not want the browser page to always jump to the top + if you trigger a link or button action that stays on the same page. + Default: "false"</description> + </context-param> + <context-param> + <param-name>tiles-definitions</param-name> + <param-value>/WEB-INF/tiles.xml</param-value> + </context-param> + <context-param> +<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> +<param-value>org.apache.myfaces.application.jsp.JspTilesViewHandlerImpl</param-value> +</context-param> + + + <filter> + <filter-name>extensionsFilter</filter-name> + <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class> + <init-param> + <param-name>uploadMaxFileSize</param-name> + <param-value>10m</param-value> + <description>Set the size limit for uploaded files. + Format: 10 - 10 bytes + 10k - 10 KB + 10m - 10 MB + 1g - 1 GB</description> + </init-param> + <init-param> + <param-name>uploadThresholdSize</param-name> + <param-value>1k</param-value> + <description>Set the threshold size - files + below this limit are stored in memory, files above + this limit are stored on disk. + + Format: 10 - 10 bytes + 10k - 10 KB + 10m - 10 MB + 1g - 1 GB + </description> + </init-param> + </filter> +  + <filter> + <filter-name>shale</filter-name> + <filter-class> + org.apache.shale.faces.ShaleApplicationFilter + </filter-class> + </filter> + <filter> + <filter-name>security</filter-name> + <filter-class> + com.pfizer.eNCA.filter.SecurityFilter + </filter-class> + </filter> + <filter> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + </filter-mapping> + <filter-mapping> + <filter-name>shale</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>extensionsFilter</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>extensionsFilter</filter-name> + <url-pattern>/faces/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>security</filter-name> + <url-pattern>/jsp/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> + </listener> +  + <listener> + <listener-class>org.apache.commons.chain.web.ChainListener</listener-class> + </listener> + <listener> + <listener-class>com.pfizer.eNCA.util.SessionListener</listener-class> + </listener> + +  + <servlet> + <servlet-name>MessageBrokerServlet</servlet-name> + <display-name>MessageBrokerServlet</display-name> + <servlet-class>flex.messaging.MessageBrokerServlet</servlet-class> + <init-param> + <param-name>services.configuration.file</param-name> + <param-value>/WEB-INF/flex/flex-enterprise-services.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexMxmlServlet</servlet-name> + <display-name>MXML Processor</display-name> + <description>Servlet wrapper for the Mxml Compiler</description> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex2.server.j2ee.MxmlServlet</param-value> + </init-param> + <init-param> + <param-name>webtier.configuration.file</param-name> + <param-value>/WEB-INF/flex/flex-webtier-config.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexSwfServlet</servlet-name> + <display-name>SWF Retriever</display-name> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex2.server.j2ee.SwfServlet</param-value> + </init-param> +  + <load-on-startup>2</load-on-startup> + </servlet> + + <servlet> + <servlet-name>FlexInternalServlet</servlet-name> + <servlet-class>flex.bootstrap.BootstrapServlet</servlet-class> + <init-param> + <param-name>servlet.class</param-name> + <param-value>flex.server.j2ee.filemanager.FileManagerServlet</param-value> + </init-param> + <load-on-startup>10</load-on-startup> + </servlet> + + + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>updateRequest</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.AJAXServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>treeRequest</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.TreeStateServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>renderExcel</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.RenderExcel</servlet-class> + </servlet> + <servlet> + <servlet-name>renderSPlus</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.RenderSPlus</servlet-class> + </servlet> + <servlet> + <servlet-name>pkFile</servlet-name> + <servlet-class>com.pfizer.eNCA.servlets.PKFileReaderServlet</servlet-class> + <init-param> + <param-name>requiredSessionObject</param-name> + <param-value>loggedInUser</param-value> + <description>Require Session Object for Security</description> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>MessageBrokerServlet</servlet-name> + <url-pattern>/messagebroker/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexMxmlServlet</servlet-name> + <url-pattern>*.mxml</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexSwfServlet</servlet-name> + <url-pattern>*.swf</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>FlexInternalServlet</servlet-name> + <url-pattern>/flex-internal/*</url-pattern> + </servlet-mapping> + + + <servlet-mapping> + <servlet-name>renderExcel</servlet-name> + <url-pattern>renderexcel.csv</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>renderSPlus</servlet-name> + <url-pattern>rendersplus.sdd</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>updateRequest</servlet-name> + <url-pattern>/updateRequest/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>treeRequest</servlet-name> + <url-pattern>/treeRequest/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>pkFile</servlet-name> + <url-pattern>/pk/*</url-pattern> + </servlet-mapping> + <mime-mapping> + <extension>doc</extension> + <mime-type>application/msword</mime-type> + </mime-mapping> + <mime-mapping> + <extension>xls</extension> + <mime-type>application/vnd.ms-excel</mime-type> + </mime-mapping> + <mime-mapping> + <extension>ppt</extension> + <mime-type>application/vnd.ms-powerpoint</mime-type> + </mime-mapping> + <mime-mapping> + <extension>swf</extension> + <mime-type>application/x-shockwave-flash</mime-type> + </mime-mapping> + <mime-mapping> + <extension>pdf</extension> + <mime-type>application/pdf</mime-type> + </mime-mapping> + <mime-mapping> + <extension>inc</extension> + <mime-type>text/html</mime-type> + </mime-mapping> + <mime-mapping> + <extension>zip</extension> + <mime-type>application/zip</mime-type> + </mime-mapping> + <mime-mapping> + <extension>exe</extension> + <mime-type>application/octet-stream</mime-type> + </mime-mapping> + <mime-mapping> + <extension>csv</extension> + <mime-type>application/x-csv</mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file>/jsp/index.jsp</welcome-file> + </welcome-file-list> + <taglib> + <taglib-uri>http://struts.apache.org/tags-tiles</taglib-uri> + <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> + </taglib> + + <security-constraint> + <display-name>Restrict access to JSP pages</display-name> + <web-resource-collection> + <web-resource-name>Restrict access to JSP pages</web-resource-name> + <url-pattern>/jsp/*.jsp</url-pattern> + </web-resource-collection> + <auth-constraint> + <description>With no roles defined, no access granted</description> + </auth-constraint> + </security-constraint> +</web-app> + Added: branches/refactor1/framework/test/src/test/resources/WEB-INF/web.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/WEB-INF/web.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/WEB-INF/web.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>testcase</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + + <filter> + <description>Convert HTML to XML</description> + <display-name>Filter</display-name> + <filter-name>A4J</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>publicid</param-name> + <param-value>-//W3C//DTD XHTML 1.0 Transitional//EN</param-value> + </init-param> + <init-param> + <param-name>systemid</param-name> + <param-value>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</param-value> + </init-param> + <init-param> + <param-name>namespace</param-name> + <param-value>http://www.w3.org/1999/xhtml</param-value> + </init-param> + <init-param> + <param-name>forceparser</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>rewriteid</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>mime-type</param-name> + <param-value>text/xml</param-value> + </init-param> + <init-param> + <param-name>log4j-init-file</param-name> + <param-value>WEB-INF/log4j.xml</param-value> + </init-param> + <init-param> + <param-name>enable-cache</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> +</web-app> Added: branches/refactor1/framework/test/src/test/resources/bindedtest.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/bindedtest.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/bindedtest.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,4 @@ +render.kit=TEST +string.property=bindedstring +int.property=10 +bind.property=\#{test.bean} Added: branches/refactor1/framework/test/src/test/resources/log4j.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/log4j.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/log4j.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!DOCTYPE log4j:configuration SYSTEM "file:///eclipse/dtdcache/log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + +  + <appender name="DEFAULT" class="org.apache.log4j.ConsoleAppender"> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/> + </layout> + </appender> + + + <category name="com.sun.faces"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + + <category name="org.apache.myfaces"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + + <category name="javax.faces"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + + <category name="faces"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + + <category name="com.exadel.vcp"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + + + <category name="org.ajax4jsf"> + <priority value="INFO" /> + <appender-ref ref="DEFAULT"/> + </category> + +  +</log4j:configuration> Added: branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/call.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http://jsf.exadel.com/template' + xmlns:u='http://jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > + <u:selector name=".exadel_debug_console"> + <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCall" /> + <u:style name="margin" value="0px"/> + <u:style name="font-size" skin="preferableDataSizeFont"></u:style> + </u:selector> +</f:template> \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/callWithParam.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http://jsf.exadel.com/template' + xmlns:u='http://jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > + <u:selector name=".exadel_debug_console"> + <f:call name="org.ajax4jsf.framework.resource.CSSTemplateTestCase.contextCallWithParam" > + <f:parameter value="Test" /> + </f:call> + <u:style name="margin" value="0px"/> + <u:style name="font-size" skin="preferableDataSizeFont"></u:style> + </u:selector> +</f:template> \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/styles.xml =================================================================== --- branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/styles.xml (rev 0) +++ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/styles.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template xmlns:f='http://jsf.exadel.com/template' + xmlns:u='http://jsf.exadel.com/template/util' + xmlns="http://www.w3.org/1999/xhtml" > + <u:selector name=".exadel_debug_console"> + <u:style name="position" value="fixed"/> + <u:style name="z-index" value="80"/> + <u:style name="width" value="99%"/> + <u:style name="height" context="height"/> + <u:style name="left" value="10px"/> + <u:style name="bottom" value="30px"/> + </u:selector> + <u:selector name=".exadel_debug_console_minimized"> + <u:style name="position" value="fixed"/> + <u:style name="z-index" value="80"/> + <u:style name="width" value="40px"/> + <u:style name="height" value="40px"/> + <u:style name="left" value="10px"/> + <u:style name="bottom" value="0"/> + </u:selector> + <u:selector name=".exadel_debug_console_inner"> + <u:style name="width" value="auto"/> + <u:style name="height" value="auto"/> + <u:style name="border"> + <f:verbatim value="1px solid "/> + <f:verbatim skin="overAllBackground"/> + </u:style> + <u:style name="background-color" skin="generalBackgroundColor"/> + <u:style name="margin" value="10px"/> + <u:style name="margin-bottom" value="20px"/> + </u:selector> + <u:selector name=".exadel_debug_console_header, .exadel_debug_console_header a"> + <u:style name="background-color" skin="headerBackgroundColor"/> + <u:style name="margin" value="1px"/> + <u:style name="text-align" value="center"/> + <u:style name="vertical-align" value="middle"/> + <u:style name="color" skin="headTextColor"/> + <u:style name="text-decoration" value="none"/> + </u:selector> + <u:selector name=".exadel_debug_console_header TD, TD.exadel_debug_console_header"> + <u:style name="vertical-align" value="middle"/> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="font-weight" skin="preferableHeaderWeightFont"/> + <u:style name="white-space" value="nowrap"/> + <u:style name="padding" value="4px"/> + </u:selector> + <u:selector name=".exadel_debug_console_toolbar TD"> + <u:style name="vertical-align" value="middle"/> + <u:style name="font-family" skin="tabFamilyFont"/> + <u:style name="font-size" skin="tabSizeFont"/> + <u:style name="white-space" value="nowrap"/> + <u:style name="padding" value="4px"/> + <u:style name="text-align" value="center"/> + </u:selector> + <u:selector name=".exadel_debug_console_toolbar a"> + <u:style name="text-decoration" value="none"/> + </u:selector> + <u:selector name=".exadel_debug_console_output"> + <u:style name="height" context="panelHeight"/> +  +  + <u:style name="margin" value="4px"/> + <u:style name="padding" value="4px"/> + <u:style name="overflow" value="auto"/> + <u:style name="border-right" value=" 1px solid "><f:verbatim skin="tableBorderColor"/></u:style> + <u:style name="border-top" value=" 1px solid "><f:verbatim skin="generalTextColor"/></u:style> + <u:style name="border-left" value=" 1px solid "><f:verbatim skin="generalTextColor"/></u:style> + <u:style name="border-bottom" value=" 1px solid "><f:verbatim skin="tableBorderColor"/></u:style> + <u:style name="color" skin="controlTextColor"/> + <u:style name="font-weight" value=" normal"/> + <u:style name="font-size" skin="preferableDataSizeFont"/> + <u:style name="font-family" skin="preferableDataFamilyFont"/> + <u:style name="background-color" skin="tableBackgroundColor"/> +  +  + </u:selector> + <u:selector name=".exadel_debug_console_inactive_tab"> + <u:style name="color" skin="generalLinkColor"/> + </u:selector> + <u:selector name=".exadel_debug_console_active_tab"> + <u:style name="color" skin="generalTextColor"/> + <u:style name="font-weight" value="bold"/> + </u:selector> + <u:selector name=".exadel_debug_console_shadow_corner, .exadel_debug_console_shadow_h, .exadel_debug_console_shadow_v"> + <u:style name="background-color" value="#000000"/> + <u:style name="line-height" value="0px"/> + </u:selector> + <u:selector name=".exadel_debug_console_tree"> + <u:style name="font-family" skin="preferableDataFamilyFont"></u:style> + </u:selector> + <u:selector name="li.exadel_debug_console_tree, pre.exadel_debug_console_tree"> + <u:style name="padding" value="0px"/> + <u:style name="margin" value="0px"/> + <u:style name="font-size" skin="preferableDataSizeFont"></u:style> + </u:selector> +</f:template> \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/test.js =================================================================== --- branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/test.js (rev 0) +++ branches/refactor1/framework/test/src/test/resources/org/ajax4jsf/framework/resource/test.js 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1 @@ +function Test(){}; Added: branches/refactor1/framework/test/src/test/resources/oscache.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/oscache.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/oscache.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,2 @@ +cache.memory true +cache.capacity 15 \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/placeholder.txt =================================================================== --- branches/refactor1/framework/test/src/test/resources/placeholder.txt (rev 0) +++ branches/refactor1/framework/test/src/test/resources/placeholder.txt 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1 @@ +Test Cases for framework \ No newline at end of file Added: branches/refactor1/framework/test/src/test/resources/test.skin.properties =================================================================== --- branches/refactor1/framework/test/src/test/resources/test.skin.properties (rev 0) +++ branches/refactor1/framework/test/src/test/resources/test.skin.properties 2007-06-28 21:59:51 UTC (rev 1395) @@ -0,0 +1,6 @@ +string.property=string + +int.property=10 + +bind.property=\#{test.bean} + Added: branches/refactor1/framework/test/src/test/resources/test.web.root =================================================================== Modified: branches/refactor1/pom.xml =================================================================== --- branches/refactor1/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -34,11 +34,78 @@ <url>${snapshotRepository}</url> </snapshotRepository> </distributionManagement> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk</developerConnection> - <url>http://anonsvn.jboss.org/repos/richfaces/trunk</url> - </scm> + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/jira/browse/RF</url> + </issueManagement> + <ciManagement> + <system>cruisecontrol</system> + </ciManagement> + <developers> + <developer> + <id>alexsmirnov</id> + <name>Alexander Smirnov</name> + <email>alexsmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-3</timezone> + </developer> + <developer> + <id>ishabalov</id> + <name>Igor Shabalov</name> + <email>ishabalov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <id>sergeysmirnov</id> + <name>Sergey Smirnov</name> + <email>sergeysmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <id>nbelayevsky</id> + <name>Nik Belyaevsky</name> + <email>nbelayevsky(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-2</timezone> + </developer> + </developers> + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk</developerConnection> + <url>http://anonsvn.jboss.org/repos/richfaces/trunk</url> + </scm> <profiles> <profile> <id>sandbox</id> Modified: branches/refactor1/ui/assembly/pom.xml =================================================================== --- branches/refactor1/ui/assembly/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/assembly/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>richfaces</artifactId> <name>RichFaces JSF components library</name> <packaging>jar</packaging> Modified: branches/refactor1/ui/common/pom.xml =================================================================== --- branches/refactor1/ui/common/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/common/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <name>common classes</name> <build> Modified: branches/refactor1/ui/dataFilterSlider/pom.xml =================================================================== --- branches/refactor1/ui/dataFilterSlider/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/dataFilterSlider/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>dataFilterSlider</artifactId> <name>Data Filter Slider</name> <build> @@ -61,7 +61,7 @@ </pluginRepositories> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.parent.version}</version> </dependency> Modified: branches/refactor1/ui/dataTable/pom.xml =================================================================== --- branches/refactor1/ui/dataTable/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/dataTable/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> <name>Extended data table and lists</name> <build> Modified: branches/refactor1/ui/datascroller/pom.xml =================================================================== --- branches/refactor1/ui/datascroller/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/datascroller/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>datascroller</artifactId> <name>Data Scroller</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/drag-drop/pom.xml =================================================================== --- branches/refactor1/ui/drag-drop/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/drag-drop/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> <name>Drag and Drop</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/dropdown-menu/pom.xml =================================================================== --- branches/refactor1/ui/dropdown-menu/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/dropdown-menu/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>dropdown-menu</artifactId> <name>Drop down menu</name> <build> @@ -42,12 +42,12 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/gmap/pom.xml =================================================================== --- branches/refactor1/ui/gmap/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/gmap/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>gmap</artifactId> <name>Google map</name> <build> Modified: branches/refactor1/ui/inputnumber-slider/pom.xml =================================================================== --- branches/refactor1/ui/inputnumber-slider/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/inputnumber-slider/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-slider</artifactId> <name>Input number slider</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/refactor1/ui/inputnumber-spinner/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/inputnumber-spinner/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> <name>Input number spinner</name> <build> @@ -43,7 +43,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/menu-components/pom.xml =================================================================== --- branches/refactor1/ui/menu-components/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/menu-components/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> <name>Menu components</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/modal-panel/pom.xml =================================================================== --- branches/refactor1/ui/modal-panel/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/modal-panel/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>modal-panel</artifactId> <name>Modal panel</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/paint2D/pom.xml =================================================================== --- branches/refactor1/ui/paint2D/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/paint2D/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>paint2D</artifactId> <name>Paint java 2D</name> <build> Modified: branches/refactor1/ui/panel/pom.xml =================================================================== --- branches/refactor1/ui/panel/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/panel/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>panel</artifactId> <name>Panel</name> <build> @@ -43,7 +43,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/panelbar/pom.xml =================================================================== --- branches/refactor1/ui/panelbar/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/panelbar/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>panelbar</artifactId> <name>Panel Bar</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/pom.xml =================================================================== --- branches/refactor1/ui/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -1,87 +1,18 @@ <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>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>ui</artifactId> <packaging>pom</packaging> <name>RichFaces Components</name> - <version>3.1.0-SNAPSHOT</version> - <url>http://richfaces.ajax4jsf.org</url> <properties> <maven.test.failure.ignore>true</maven.test.failure.ignore>  </properties> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/jira/browse/RF</url> - </issueManagement> - <ciManagement> - <system>cruisecontrol</system> - </ciManagement> - <developers> - <developer> - <id>alexsmirnov</id> - <name>Alexander Smirnov</name> - <email>alexsmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-3</timezone> - </developer> - <developer> - <id>ishabalov</id> - <name>Igor Shabalov</name> - <email>ishabalov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>sergeysmirnov</id> - <name>Sergey Smirnov</name> - <email>sergeysmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>nbelayevsky</id> - <name>Nik Belyaevsky</name> - <email>nbelayevsky(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-2</timezone> - </developer> - </developers> - <licenses> - <license> - <name>LGPL 2.1</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments> - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - </comments> - </license> - </licenses> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/richfaces</developerConnection> - <url>http://anonsvn.jboss.org/repos/richfaces/trunk/richfaces/</url> - </scm> <build> <plugins> <plugin> @@ -231,14 +162,14 @@ <version>3.0</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> - <artifactId>ajax4jsf</artifactId> - <version>3.1.0-SNAPSHOT</version> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.framework</groupId> <artifactId>test</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> Modified: branches/refactor1/ui/separator/pom.xml =================================================================== --- branches/refactor1/ui/separator/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/separator/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>separator</artifactId> <name>Separator components</name> <build> @@ -44,7 +44,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>simpleTogglePanel</artifactId> <name>Toggle panel</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/spacer/pom.xml =================================================================== --- branches/refactor1/ui/spacer/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/spacer/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>spacer</artifactId> <name>Spacer</name> <build> Modified: branches/refactor1/ui/suggestionbox/pom.xml =================================================================== --- branches/refactor1/ui/suggestionbox/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/suggestionbox/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> <name>Suggestion box</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/tabPanel/pom.xml =================================================================== --- branches/refactor1/ui/tabPanel/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/tabPanel/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>tabPanel</artifactId> <name>Tab panel</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/togglePanel/pom.xml =================================================================== --- branches/refactor1/ui/togglePanel/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/togglePanel/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>togglePanel</artifactId> <name>Toggle panel</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/toolBar/pom.xml =================================================================== --- branches/refactor1/ui/toolBar/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/toolBar/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>toolBar</artifactId> <name>Tool bar</name> <build> @@ -42,7 +42,7 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/ui/tree/pom.xml =================================================================== --- branches/refactor1/ui/tree/pom.xml 2007-06-28 21:40:32 UTC (rev 1394) +++ branches/refactor1/ui/tree/pom.xml 2007-06-28 21:59:51 UTC (rev 1395) @@ -5,7 +5,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> <name>Tree control</name> <build> @@ -42,12 +42,12 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> <version>${project.version}</version> </dependency>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1394 - branches/refactor1/framework/impl/src/main.

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

Author: alexsmirnov Date: 2007-06-28 17:40:32 -0400 (Thu, 28 Jun 2007) New Revision: 1394 Removed: branches/refactor1/framework/impl/src/main/config/ Log: continue refactoring

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1393 - in branches/refactor1/ui/core/src/main: config and 1 other directory.

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

Author: alexsmirnov Date: 2007-06-28 17:23:31 -0400 (Thu, 28 Jun 2007) New Revision: 1393 Added: branches/refactor1/ui/core/src/main/config/ Removed: branches/refactor1/ui/core/src/main/config/faces/ Log: continue refactoring Copied: branches/refactor1/ui/core/src/main/config (from rev 1388, branches/refactor1/framework/impl/src/main/config)

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1392 - in branches/refactor1/framework/impl/src/main: resources/META-INF and 1 other directory.

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

Author: alexsmirnov Date: 2007-06-28 17:19:59 -0400 (Thu, 28 Jun 2007) New Revision: 1392 Added: branches/refactor1/framework/impl/src/main/resources/META-INF/faces-config.xml Removed: branches/refactor1/framework/impl/src/main/config/faces/ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t Log: continue refactoring Copied: branches/refactor1/framework/impl/src/main/resources/META-INF/faces-config.xml (from rev 1391, branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml) =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/faces-config.xml (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/faces-config.xml 2007-06-28 21:19:59 UTC (rev 1392) @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC + "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> + + +<faces-config> + <factory> + <render-kit-factory>org.ajax4jsf.framework.renderer.ChameleonRenderKitFactory</render-kit-factory> + <lifecycle-factory>org.ajax4jsf.framework.DebugLifecycleFactory</lifecycle-factory> + </factory> + <application> +  + <view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler> + <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> + </application> + <lifecycle> + <phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener> + </lifecycle> + <managed-bean> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> +  + <component> + + <component-type>javax.faces.ViewRoot</component-type> + <component-class>org.ajax4jsf.framework.ajax.AjaxViewRoot</component-class> + + <component-extension> + <component-family>javax.faces.ViewRoot</component-family> + </component-extension> + + </component> + + <render-kit> + + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.framework.renderer.AjaxViewRootRenderer</renderer-class> + </renderer> +  + </render-kit> +</faces-config> Deleted: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml 2007-06-28 21:15:47 UTC (rev 1391) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml 2007-06-28 21:19:59 UTC (rev 1392) @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE faces-config PUBLIC - "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" - "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> - - -<faces-config> - <factory> - <render-kit-factory>org.ajax4jsf.framework.renderer.ChameleonRenderKitFactory</render-kit-factory> - <lifecycle-factory>org.ajax4jsf.framework.DebugLifecycleFactory</lifecycle-factory> - </factory> - <application> -  - <view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler> - <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> - </application> - <lifecycle> - <phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener> - <phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener> - </lifecycle> - <managed-bean> - <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> -  - <component> - - <component-type>javax.faces.ViewRoot</component-type> - <component-class>org.ajax4jsf.framework.ajax.AjaxViewRoot</component-class> - - <component-extension> - <component-family>javax.faces.ViewRoot</component-family> - </component-extension> - - </component> - - <render-kit> - - <renderer> - <description> - override the viewroot - </description> - <component-family>javax.faces.ViewRoot</component-family> - <renderer-type>javax.faces.ViewRoot</renderer-type> - <renderer-class>org.ajax4jsf.framework.renderer.AjaxViewRootRenderer</renderer-class> - </renderer> -  - </render-kit> -</faces-config> Deleted: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t 2007-06-28 21:15:47 UTC (rev 1391) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t 2007-06-28 21:19:59 UTC (rev 1392) @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PROCESS ENTITY="JSFProcess"/>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1391 - in branches/refactor1: cdk and 158 other directories.

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

Author: alexsmirnov Date: 2007-06-28 17:15:47 -0400 (Thu, 28 Jun 2007) New Revision: 1391 Added: branches/refactor1/cdk/generator/target/ branches/refactor1/cdk/generator/target/classes/ branches/refactor1/cdk/generator/target/classes/META-INF/ branches/refactor1/cdk/generator/target/classes/META-INF/plexus/ branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml branches/refactor1/cdk/generator/target/classes/META-INF/schema/ branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent branches/refactor1/cdk/generator/target/classes/META-INF/templates/ branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm branches/refactor1/cdk/generator/target/classes/VM_global_library.vm branches/refactor1/cdk/generator/target/classes/org/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar branches/refactor1/cdk/generator/target/surefire-reports/ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt branches/refactor1/cdk/generator/target/test-classes/ branches/refactor1/cdk/generator/target/test-classes/org/ branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/ branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/ branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/ branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class branches/refactor1/cdk/generator/target/test-classes/test/ branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class branches/refactor1/cdk/maven-archetype-jsf-component/target/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/README branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/README branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/README branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar branches/refactor1/cdk/maven-archetype-jsfwebapp/target/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar branches/refactor1/cdk/maven-cdk-plugin/target/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t branches/refactor1/framework/pom.xml Modified: branches/refactor1/cdk/generator/pom.xml branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml branches/refactor1/cdk/maven-cdk-plugin/pom.xml branches/refactor1/cdk/pom.xml branches/refactor1/docs/ajaxguide/en/pom.xml branches/refactor1/docs/ajaxguide/pom.xml branches/refactor1/docs/maven-docbook-plugin/pom.xml branches/refactor1/docs/pom.xml branches/refactor1/docs/userguide/en/pom.xml branches/refactor1/docs/userguide/pom.xml branches/refactor1/docs/xslt/pom.xml branches/refactor1/extensions/gwt/pom.xml branches/refactor1/extensions/portlet/pom.xml branches/refactor1/extensions/seam/pom.xml branches/refactor1/extensions/trinidad/pom.xml branches/refactor1/framework/impl/pom.xml branches/refactor1/pom.xml branches/refactor1/samples/ajaxPortlet/pom.xml branches/refactor1/samples/portal-echo/pom.xml branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml branches/refactor1/samples/richfaces-samples/pom.xml branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml branches/refactor1/samples/richfaces-samples/skins/pom.xml branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml branches/refactor1/sandbox/pom.xml branches/refactor1/sandbox/samples/calendar-sample/pom.xml branches/refactor1/sandbox/samples/panel2-sample/pom.xml branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml branches/refactor1/sandbox/samples/pom.xml branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml branches/refactor1/sandbox/samples/tooltip-sample/pom.xml branches/refactor1/sandbox/tooltip/pom.xml branches/refactor1/sandbox/ui/calendar/pom.xml branches/refactor1/sandbox/ui/panel2/pom.xml branches/refactor1/sandbox/ui/panelmenu/pom.xml branches/refactor1/sandbox/ui/scrollable-grid/pom.xml branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml branches/refactor1/ui/assembly/pom.xml branches/refactor1/ui/common/pom.xml 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/gmap/pom.xml branches/refactor1/ui/inputnumber-slider/pom.xml branches/refactor1/ui/inputnumber-spinner/pom.xml branches/refactor1/ui/menu-components/pom.xml branches/refactor1/ui/modal-panel/pom.xml branches/refactor1/ui/paint2D/pom.xml branches/refactor1/ui/panel/pom.xml branches/refactor1/ui/panelbar/pom.xml branches/refactor1/ui/pom.xml branches/refactor1/ui/separator/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/togglePanel/pom.xml branches/refactor1/ui/toolBar/pom.xml branches/refactor1/ui/tree/pom.xml Log: continue refactored Modified: branches/refactor1/cdk/generator/pom.xml =================================================================== --- branches/refactor1/cdk/generator/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/generator/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,14 +1,13 @@ <?xml version="1.0"?><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>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> <name>Java Server Faces component generator</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/generator</url> <build> <plugins> <plugin> @@ -59,26 +58,24 @@ <version>2.1</version> </dependency> <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>qdox</groupId> <artifactId>qdox</artifactId> <version>1.6</version> </dependency> <dependency> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>compiler</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> <version>2.1_3</version> </dependency> </dependencies> - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </reporting> </project> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/plexus/components.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,18 @@ +<component-set> + <components> + <component> + <role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role> + <role-hint>a4j</role-hint> + <implementation> + org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory + </implementation> + </component> + <component> + <role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role> + <role-hint>jstl</role-hint> + <implementation> + org.ajax4jsf.templatecompiler.elements.JSTLElementsFactory + </implementation> + </component> + </components> +</component-set> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/component-config.dtd 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,249 @@ + + +<!ELEMENT components (component*,renderer*,listener*,validator*,converter*) > + +<!ELEMENT component (name,family?,classname?,superclass?,test*,description?,displayname?,icon?,facet*,renderer*,tag?,taghandler?,(include|properties|property)*)> + +<!ELEMENT validator (name,classname?,superclass?,test*,description?,displayname?,icon?,tag?,taghandler?,(include|properties|property)*)> + +<!ELEMENT converter (name,classname?,superclass?,test*,description?,displayname?,icon?,tag?,taghandler?,(include|properties|property)*)> + + +<!ATTLIST component + generate (true|false) "true" + > + + +<!ATTLIST validator + generate (true|false) "true" + > + + +<!ATTLIST converter + generate (true|false) "true" + > + + + +<!ELEMENT name (#PCDATA)> + +<!ELEMENT id (#PCDATA)> + +<!ELEMENT family (#PCDATA)> + +<!ELEMENT description ANY> + +<!ELEMENT displayname ANY> + +<!ELEMENT icon (#PCDATA)> + +<!ELEMENT facet (name,displayname?,description?)> + +<!ELEMENT classname (#PCDATA)> + +<!ELEMENT superclass (#PCDATA)> + +<!ELEMENT renderer (name,(classname|template),superclass?,description?,displayname?,icon?,facet?,renderkit?)> + +<!ELEMENT renderkit (#PCDATA)> + +<!ELEMENT template (#PCDATA)> + +<!ATTLIST renderer + generate (true|false) "false" + override (true|false) "false" + > + + +<!ELEMENT tag (name,classname,superclass?,test*,taglib?,description?,displayname?,icon?)> +<!ATTLIST tag + generate (true|false) "true" + bodyContent (JSP|empty) "JSP" + > + +<!ELEMENT test (classname?,superclassname?)> + +<!ELEMENT superclassname (#PCDATA)> + + +<!ELEMENT taghandler (name?,classname,superclass?,description?,displayname?,icon?)> +<!ATTLIST taghandler + generate (true|false) "false" + > + +<!ELEMENT listener (name,listenerclass,componentclass,eventclass,methodname?,tag?,taghandler?,property*)> + +<!ELEMENT listenerclass (#PCDATA)> +<!ELEMENT eventclass (#PCDATA)> +<!ELEMENT componentclass (#PCDATA)> +<!ELEMENT methodname (#PCDATA)> + + +<!ELEMENT taglib (#PCDATA)> + + +<!ELEMENT properties ((include|properties|property)*)> + + +<!ELEMENT property (name,classname?,description?,defaultvalue?,methodargs?,alias*)> + + +<!ELEMENT defaultvalue (#PCDATA)> + + +<!ELEMENT methodargs (#PCDATA)> + + +<!ELEMENT alias (#PCDATA)> + +<!ATTLIST property + el (true|false) "true" + elonly (true|false) "false" + hidden (true|false) "false" + exist (true|false) "false" + raw (true|false) "false" + existintag (true|false) "false" + attachedstate (true|false) "false" + transient (true|false) "false" + hidden (true|false) "false" + required (true|false) "false" + disabled (true|false) "false" + > + +<!ELEMENT include EMPTY > +<!ATTLIST include + href CDATA #REQUIRED +> + + +<!ENTITY html_attributes PUBLIC "html_universal_attributes" "entities/html_universal_attributes.ent"> + +<!ENTITY html_events PUBLIC "html_events" "entities/html_events.ent"> + +<!ENTITY html_control_events PUBLIC "html_control_events" "entities/html_control_events.ent"> + +<!ENTITY ajax_region_attributes PUBLIC "ajax_region_attributes" "entities/ajax_region_attributes.ent"> + +<!ENTITY ajax_component_attributes PUBLIC "ajax_component_attributes" "entities/ajax_component_attributes.ent"> + +<!ENTITY ajax_output_attributes PUBLIC "ajax_output_attributes" "entities/ajax_output_attributes.ent"> + +<!ENTITY ajax_dnd_attributes PUBLIC "ajax_dnd_attributes" "entities/ajax_dnd_attributes.ent"> + +<!ENTITY dropzone_attributes PUBLIC "dropzone_attributes" "entities/dropzone_attributes.ent"> + +<!ENTITY draggable_attributes PUBLIC "draggable_attributes" "entities/draggable_attributes.ent"> + + + + +<!ENTITY validator_min_max_attributes PUBLIC "validator_min_max_attributes" "entities/validator_min_max_attributes.ent"> + +<!ENTITY ui_component_attributes PUBLIC "ui_component_attributes" "entities/ui_component_attributes.ent"> + +<!ENTITY ui_parameter_attributes PUBLIC "ui_parameter_attributes" "entities/ui_parameter_attributes.ent"> + +<!ENTITY ui_for_attribute PUBLIC "ui_for_attribute" "entities/ui_for_attribute.ent"> + +<!ENTITY ui_select_item_attributes PUBLIC "ui_select_item_attributes" "entities/ui_select_item_attributes.ent"> + +<!ENTITY ui_select_items_attributes PUBLIC "ui_select_items_attributes" "entities/ui_select_items_attributes.ent"> + +<!ENTITY html_anchor_attributes PUBLIC "html_anchor_attributes" "entities/html_anchor_attributes.ent"> + +<!ENTITY html_button_attributes PUBLIC "html_button_attributes" "entities/html_button_attributes.ent"> + +<!ENTITY html_event_handler_attributes PUBLIC "html_event_handler_attributes" "entities/html_events.ent"> + +<!ENTITY html_form_attributes PUBLIC "html_form_attributes" "entities/html_form_attributes.ent"> + +<!ENTITY spec_img_attributes PUBLIC "spec_img_attributes" "entities/spec_img_attributes.ent"> + +<!ENTITY html_img_attributes PUBLIC "html_img_attributes" "entities/html_img_attributes.ent"> + +<!ENTITY html_input_attributes PUBLIC "html_input_attributes" "entities/html_input_attributes.ent"> + +<!ENTITY html_input_checkbox_attributes PUBLIC "html_input_checkbox_attributes" "entities/html_input_checkbox_attributes.ent"> + +<!ENTITY html_input_radio_attributes PUBLIC "html_input_radio_attributes" "entities/html_input_radio_attributes.ent"> + +<!ENTITY html_label_attributes PUBLIC "html_label_attributes" "entities/html_label_attributes.ent"> + +<!ENTITY html_select_attributes PUBLIC "html_select_attributes" "entities/html_select_attributes.ent"> + +<!ENTITY html_table_attributes PUBLIC "html_table_attributes" "entities/html_table_attributes.ent"> + +<!ENTITY html_textarea_attributes PUBLIC "html_textarea_attributes" "entities/html_textarea_attributes.ent"> + +<!ENTITY html_universal_attributes PUBLIC "html_universal_attributes" "entities/html_universal_attributes.ent"> + +<!ENTITY html_style_attributes PUBLIC "html_style_attributes" "entities/html_style_attributes.ent"> + +<!ENTITY html_control_attributes PUBLIC "html_control_attributes" "entities/html_control_attributes.ent"> + +<!ENTITY html_control_events PUBLIC "html_control_events" "entities/html_control_events.ent"> + +<!ENTITY html_events PUBLIC "html_events" "entities/html_events.ent"> + +<!ENTITY html_input_events PUBLIC "html_input_events" "entities/html_input_events.ent"> + +<!ENTITY ui_column_attributes PUBLIC "ui_column_attributes" "entities/ui_column_attributes.ent"> + +<!ENTITY ui_command_attributes PUBLIC "ui_command_attributes" "entities/ui_command_attributes.ent"> + +<!ENTITY ui_component_attributes PUBLIC "ui_component_attributes" "entities/ui_component_attributes.ent"> + +<!ENTITY ui_data_attributes PUBLIC "ui_data_attributes" "entities/ui_data_attributes.ent"> + +<!ENTITY ui_form_attributes PUBLIC "ui_form_attributes" "entities/ui_form_attributes.ent"> + +<!ENTITY ui_graphic_attributes PUBLIC "ui_graphic_attributes" "entities/ui_graphic_attributes.ent"> + +<!ENTITY ui_input_attributes PUBLIC "ui_input_attributes" "entities/ui_input_attributes.ent"> + +<!ENTITY ui_message_attributes PUBLIC "ui_message_attributes" "entities/ui_message_attributes.ent"> + +<!ENTITY ui_messages_attributes PUBLIC "ui_messages_attributes" "entities/ui_messages_attributes.ent"> + +<!ENTITY ui_output_attributes PUBLIC "ui_output_attributes" "entities/ui_output_attributes.ent"> + +<!ENTITY ui_panel_attributes PUBLIC "ui_panel_attributes" "entities/ui_panel_attributes.ent"> + +<!ENTITY ui_parameter_attributes PUBLIC "ui_parameter_attributes" "entities/ui_parameter_attributes.ent"> + +<!ENTITY ui_select_boolean_attributes PUBLIC "ui_select_boolean_attributes" "entities/ui_select_boolean_attributes.ent"> + +<!ENTITY ui_select_many_attributes PUBLIC "ui_select_many_attributes" "entities/ui_select_many_attributes.ent"> + +<!ENTITY ui_select_one_attributes PUBLIC "ui_select_one_attributes" "entities/ui_select_one_attributes.ent"> + +<!ENTITY spec_img_attributes PUBLIC "spec_img_attributes" "entities/spec_img_attributes.ent"> + +<!ENTITY spec_table_attributes PUBLIC "spec_table_attributes" "entities/spec_table_attributes.ent"> + +<!ENTITY content_component_attributes PUBLIC "content_component_attributes" "entities/content_component_attributes.ent"> + +<!ENTITY header_component_attributes PUBLIC "header_component_attributes" "entities/header_component_attributes.ent"> + \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_component_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,91 @@ +<properties> +  + + <property > + <name>ajaxSingle</name> + <classname>boolean</classname> + <description>if "true", submits ONLY one field/link, instead of all form controls</description> + </property> + + <property > + <name>bypassUpdates</name> + <classname>boolean</classname> + <description>If "true", after process validations phase it skips updates of model beans on a force render response. It can be used for validating components input</description> + </property> + + <property > + <name>limitToList</name> + <classname>boolean</classname> + <description>If "true", updates on client side ONLY elements from this 'reRender' property. If "false" (default) updates all rendered by ajax region components</description> + </property> + + <property > + <name>reRender</name> + <classname>java.lang.Object</classname> + <description>Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection</description> + </property> + + <property > + <name>status</name> + <classname>java.lang.String</classname> + <description>ID (in format of call UIComponent.findComponent()) of Request status component</description> + </property> + + <property > + <name>eventsQueue</name> + <classname>java.lang.String</classname> + <description>Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.)</description> + </property> + + <property > + <name>requestDelay</name> + <classname>int</classname> + <description> Delay (in ms.) for send ajax request on JavaScript event. In conjunction with events queue can reduce number of requests on keyboard or mouse move events</description> + </property> + + <property > + <name>oncomplete</name> + <classname>java.lang.String</classname> + <description>JavaScript code for call after request completed on client side</description> + </property> + <property > + <name>focus</name> + <classname>java.lang.String</classname> + <description>id of element to set focus after request completed on client side</description> + </property> + <property > + <name>data</name> + <classname>java.lang.Object</classname> + <description>Serialized (on default with JSON) data passed on the client by a developer on AJAX request. It's accessible via "data.foo" syntax</description> + </property> + <property> + <name>ignoreDupResponses</name> + <classname>boolean</classname> + <description> + If "true", unfinished request will be aborted on new event + </description> + </property> + <property> + <name>timeout</name> + <classname>int</classname> + <description>Response waiting time on a particular request. If a response is not received during this time, the request is aborted</description> + </property> +  +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_dnd_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +<properties> + <property hidden="true"> + <name>tagName</name> + <classname>java.lang.String</classname> + <description><![CDATA[A name of an html element encoded for this component.]]></description> + <defaultvalue><![CDATA["div"]]></defaultvalue> + </property> + <property> + <name>sid</name> + <classname>java.lang.String</classname> + <description><![CDATA[EXACT value for an encoded html 'id' attribute, instead of JSF client id generation.]]></description> +  + </property> + <property hidden="true"> + <name>effectDepth</name> + <classname>java.lang.String</classname> + <description>depth from 0 ( max ) to 1 ( none ) of visual effect ( zoom, opacity etc )</description> + </property> + <property hidden="true"> + <name>effectDuration</name> + <classname>java.lang.String</classname> + <description>time in seconds for duration of visual effect ( zoom, opacity etc )</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_output_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,21 @@ +<properties> + <property> + <name>ajaxRendered</name> + <classname>boolean</classname> + <defaultvalue>true</defaultvalue> + <description> + Define, must be (or not) content of this component will be included in AJAX response created by parent AJAX Container, even if not forced by reRender list of ajax action. + ignored if component marked to output by Ajax action. + </description> + </property> + <property> + <name>keepTransient</name> + <classname>boolean</classname> + <description><![CDATA[ + Flag for mark all child components to non-transient. If "true", all children components will be set to non-transient state and keep in saved components tree. + For output in self-renderer region all content (By default, all content in <f:verbatim> tags and non-jsf elements in facelets, marked as transient - since, self-rendered ajax regions don't plain output for ajax processing). + ]]></description> + <defaultvalue>false</defaultvalue> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ajax_region_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,26 @@ +<properties> + <property elonly="true" el="true" attachedstate="true" > + <name>ajaxListener</name> + <defaultvalue>null</defaultvalue> + <classname>javax.faces.el.MethodBinding</classname> + <methodargs>org.ajax4jsf.framework.ajax.AjaxEvent.class</methodargs> + <description> MethodBinding representing an action listener method that will be notified when this component is activated by the ajax Request and handle it. The expression must evaluate to a public method that takes an AjaxEvent parameter, with a return type of void</description> + </property> + <property hidden="true"> + <name>submitted</name> + <classname>boolean</classname> + </property> + <property > + <name>selfRendered</name> + <classname>boolean</classname> + <description>if "true", self-render subtree at InvokeApplication ( or Decode, if immediate property set to true ) phase </description> + </property> + + <property > + <name>immediate</name> + <classname>boolean</classname> + <description>Flag indicating that, if this component is activated by ajaxrequest, notifications should be delivered to interested listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke Application phase</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/alt_location_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +<properties> + + <property> + <name>javascriptLocation</name><classname>java.lang.String</classname><description> + An alternate location to find javascript resources. If no values are specified, javaScript will + be loaded from the resources directory using AddResource and ExtensionsFilter + </description> + </property> + + <property> + <name>imageLocation</name><classname>java.lang.String</classname><description> + An alternate location to find image resources. If no values are specified, images will + be loaded from the resources directory using AddResource and ExtensionsFilter + </description> + </property> + + <property> + <name>styleLocation</name><classname>java.lang.String</classname><description> + An alternate location to find stylesheet resources. If no values are specified, stylesheets will + be loaded from the resources directory using AddResource and ExtensionsFilter + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/content_component_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,14 @@ +<properties> + <property> + <name>contentStyle</name> + <classname>java.lang.String</classname> + <description>The component content style</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + <property> + <name>contentClass</name> + <classname>java.lang.String</classname> + <description>The component content style class</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/display_value_only_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,22 @@ +<properties> + + + <property> + <name>displayValueOnly</name><classname>java.lang.String</classname><description> + If "true", renders only the value of the component, but no input widget. + Default is false + </description> + </property> + <property> + <name>displayValueOnlyStyle</name><classname>java.lang.String</classname><description> + Style used when displayValueOnly is true + </description> + </property> + <property> + <name>displayValueOnlyStyleClass</name><classname>java.lang.String</classname><description> + Style class used when displayValueOnly is true + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/doc_start.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1 @@ +<properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/draggable_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,36 @@ +<properties> + <property > + <name>dragValue</name> + <classname>java.lang.Object</classname> + <description><![CDATA[Data to be sent to the drop zone after a drop event]]></description> + </property> + <property> + <name>dragType</name> + <classname>java.lang.String</classname> + <description><![CDATA[Key of a drag object. It's used to define a necessity of processing the current dragged element on the drop zone side]]></description> + </property> + <property> + <name>dragIndicator</name> + <classname>java.lang.String</classname> + <description><![CDATA[Id of the dragIndicator component used as drag operation cursor]]></description> + </property> + <property > + <name>ondragstart</name> + <classname>java.lang.String</classname> + <description>A JavaScript event handler called before drag object</description> + </property> + <property> + <name>ondragend</name> + <classname>java.lang.String</classname> + <description>A JavaScript event handler called after a drag operation</description> + </property> + <property elonly="true" attachedstate="true"> + <name>dragListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description> + MethodBinding representing an listener method that will be notified afrer drag operation. + </description> + <methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/dropzone_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,48 @@ +<properties> + <property > + <name>dropValue</name> + <classname>java.lang.Object</classname> + <description><![CDATA[Data to be processed after a drop event]]></description> + </property> + <property> + <name>typeMapping</name> + <classname>java.lang.Object</classname> + <description><![CDATA[Map between a draggable type and an indicator name on zone. it's defined with the pair (drag type:indicator name))]]></description> +  + </property> + <property> + <name>acceptedTypes</name> + <classname>java.lang.Object</classname> + <description><![CDATA[List of drag types to be processed by the current drop zone]]></description> +  + </property> + <property > + <name>ondragenter</name> + <classname>java.lang.String</classname> + <description>A JavaScript event handler called on enter draggable object to zone</description> + </property> + <property> + <name>ondragexit</name> + <classname>java.lang.String</classname> + <description>A JavaScript event handler called after a drag object leaves zone</description> + </property> + <property> + <name>ondrop</name> + <classname>java.lang.String</classname> + <description>A JavaScript event handler called after a drag object is dropped to zone</description> + </property> + <property> + <name>ondropend</name> + <classname>java.lang.String</classname> + <description>A JavaScript handler for event fired on a drop even the drop for a given type is not available</description> + </property> + <property> + <name>dropListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description><![CDATA[ + MethodBinding representing an action listener method that will be notified afrer drop operation + ]]> + </description> + <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_ajax_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,14 @@ +<properties> + + <property> + <name>onSuccess</name><classname>java.lang.String</classname><description>A JavaScript method to call on successful ajax update</description> + </property> + <property> + <name>onFailure</name><classname>java.lang.String</classname><description>A JavaScript method to call on failed ajax update</description> + </property> + <property> + <name>onStart</name><classname>java.lang.String</classname><description>A JavaScript method to call on start of ajax update</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ext_forceId_attribute.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ +<properties> + <property> + <name>forceId</name><classname>java.lang.String</classname><description>If "true", this component will force the use of the specified id when rendering</description> + </property> + <property> + <name>forceIdIndex</name><classname>java.lang.String</classname><description> + If "false", this component isn't append a '[n]' suffix (where 'n' is the row index) to components + that are contained within a "list." This value is true by default and the value is ignored if + the value of forceId is false (or not specified.) + </description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_command_link_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,134 @@ +<properties> + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at an application action to be invoked, if this UIComponent is activated manually, during the Apply Request Values or Invoke Application phase of a request processing lifecycle, depending on a value of an immediate property</description> + </property> + <property> + <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method accepting ActionEvent and returning type void</description> + </property> + <property> + <name>immediate</name><classname>java.lang.String</classname><description>"True" means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description> + </property> + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>charset</name><classname>java.lang.String</classname><description>The character encoding of the resource designated by this hyperlink</description> + </property> + <property> + <name>coords</name><classname>java.lang.String</classname><description>This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations: + + * rect: left-x, top-y, right-x, bottom-y. + * circle: center-x, center-y, radius. Note. When the radius value is percentage value, user agents should calculate the final radius value based on the associated object width and height. The radius should be the smaller value of the two. + * poly: x1, y1, x2, y2, ..., xN, yN. The first x and y coordinate pair and the last should be the same to close the polygon. When these coordinate values are not the same, user agents should infer an additional coordinate pair to close the polygon. + + Coordinates are relative to the top, left corner of the object. All values are lengths. All values are separated by commas. + </description> + </property> + + <property> + <name>hreflang</name><classname>java.lang.String</classname><description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description> + </property> + + <property> + <name>rel</name><classname>java.lang.String</classname><description>The relationship from the current document to an anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>rev</name><classname>java.lang.String</classname><description>A reverse link from an anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>shape</name><classname>java.lang.String</classname><description>default|rect|circle|poly [CI] + This attribute specifies the shape of a region. Possible values: + + * default: Specifies the entire region. + * rect: Define a rectangular region. + * circle: Define a circular region. + * poly: Define a polygonal region. + + </description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies a position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>type</name><classname>java.lang.String</classname><description> The content type of the resource designated by this hyperlink</description> + </property> + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>target</name><classname>java.lang.String</classname><description>This attribute specifies the name of a frame where a document is to be opened. + + By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements + </description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/extended_data_table_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,131 @@ +<properties> + + <property> + <name>preserveDataModel</name><classname>java.lang.String</classname><description> + Indicates whether a state of the whole DataModel should be saved and + restored. + Default: false + </description> + </property> + <property> + <name>forceIdIndexFormula</name><classname>java.lang.String</classname><description> + A formula that overrides the defaut row index in the construction of table + body components. + Example : #{myRowVar.key} + Warning, the EL should evaluate to a unique value for each row! + </description> + </property> + <property> + <name>sortColumn</name><classname>java.lang.String</classname><description> + Value reference to a model property that gives the current sort column name + </description> + </property> + <property> + <name>sortAscending</name><classname>java.lang.String</classname><description> + Value reference to a model property that gives the current sort direction + </description> + </property> + <property> + <name>preserveSort</name><classname>java.lang.String</classname><description> + Indicates whether the state of the sortColumn and sortAscending attribute + should be saved and restored and written back to a model during an + update model phase. + Default: true + </description> + </property> + <property> + <name>renderedIfEmpty</name><classname>java.lang.String</classname><description> + Indicates whether this table should be rendered if the underlying DataModel is + empty. + You could as well use rendered="#{not empty bean.list}", but this one causes + the getList method of your model bean beeing called up to five times per + request, which is not optimal when the list is backed by a DB table. + Using renderedIfEmpty="false" solves this problem, because the MyFaces + extended HtmlDataTable automatically caches the DataModel and calles the + model getter only once per request. + Default: true + </description> + </property> + <property> + <name>rowIndexVar</name><classname>java.lang.String</classname><description> + A parameter name, under which the current rowIndex is set in request scope + similar to the var parameter + </description> + </property> + <property> + <name>rowCountVar</name><classname>java.lang.String</classname><description> + A parameter name, under which the rowCount is set in request scope + similar to the var parameter + </description> + </property> + <property> + <name>previousRowDataVar</name><classname>java.lang.String</classname><description> + A parameter name, under which the previous RowData Object is set in request scope + similar to the rowIndexVar and rowCountVar parameters. + Mind that the value of this request scope attribute is null in the first row + or when isRowAvailable returns false for the previous row + </description> + </property> + <property> + <name>rowOnClick</name><classname>java.lang.String</classname><description> + Defines a JavaScript onclick event handler for each table row + </description> + </property> + <property> + <name>rowOnDblClick</name><classname>java.lang.String</classname><description> + Defines a JavaScript ondblclick event handler for each table row + </description> + </property> + <property> + <name>rowOnMouseDown</name><classname>java.lang.String</classname><description> + Defines a JavaScript onmpusedown event handler for each table row + </description> + </property> + <property> + <name>rowOnMouseUp</name><classname>java.lang.String</classname><description> + Defines a JavaScript onmouseup event handler for each table row + </description> + </property> + <property> + <name>rowOnMouseOver</name><classname>java.lang.String</classname><description> + Defines a JavaScript onmouseover event handler for each table row + </description> + </property> + <property> + <name>rowOnMouseMove</name><classname>java.lang.String</classname><description> + Defines a JavaScript onmousemove event handler for each table row + </description> + </property> + <property> + <name>rowOnMouseOut</name><classname>java.lang.String</classname><description> + Defines a JavaScript onmouseout event handler for each table row + </description> + </property> + <property> + <name>rowOnKeyPress</name><classname>java.lang.String</classname><description> + Defines a JavaScript onkeypress event handler for each table row + </description> + </property> + <property> + <name>rowOnKeyDown</name><classname>java.lang.String</classname><description> + Defines a JavaScript onkeydown event handler for each table row + </description> + </property> + <property> + <name>rowOnKeyUp</name><classname>java.lang.String</classname><description> + Defines a JavaScript onkeyup event handler for each table row + </description> + </property> + <property> + <name>rowId</name><classname>java.lang.String</classname><description> + The id to use for <tr> elements that are generated by a table + </description> + </property> + <property> + <name>rowStyleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute for the row tr tag</description> + </property> + <property> + <name>rowStyle</name><classname>java.lang.String</classname><description>Corresponds to the HTML style attribute for the row tr tag</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/header_component_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,14 @@ +<properties> + <property> + <name>headerStyle</name> + <classname>java.lang.String</classname> + <description>The component header style</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + <property> + <name>headerClass</name> + <classname>java.lang.String</classname> + <description>The component header style class</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_anchor_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,87 @@ +<properties> + <property> + <name>accesskey</name> + <classname>java.lang.String</classname> + <description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>charset</name> + <classname>java.lang.String</classname> + <description> The character encoding of a resource designated by this hyperlink</description> + </property> + <property> + <name>coords</name> + <classname>java.lang.String</classname> + <description> This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations: + + * rect: left-x, top-y, right-x, bottom-y. + * circle: center-x, center-y, radius. Note. When the radius value is percentage value, user agents should calculate the final radius value based on the associated object's width and height. The radius should be the smaller value of the two. + * poly: x1, y1, x2, y2, ..., xN, yN. The first x and y coordinate pair and the last should be the same to close the polygon. When these coordinate values are not the same, user agents should infer an additional coordinate pair to close the polygon. + + Coordinates are relative to the top, left corner of the object. All values are lengths. All values are separated by commas + </description> + </property> + + <property> + <name>hreflang</name> + <classname>java.lang.String</classname> + <description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description> + </property> + + <property> + <name>rel</name> + <classname>java.lang.String</classname> + <description>The relationship from the current document to the anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>rev</name> + <classname>java.lang.String</classname> + <description>A reverse link from the anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>shape</name> + <classname>java.lang.String</classname> + <description>default|rect|circle|poly [CI] + This attribute specifies the shape of a region. Possible values: + + * default: Specifies the entire region. + * rect: Define a rectangular region. + * circle: Define a circular region. + * poly: Define a polygonal region. + + </description> + </property> + <property> + <name>tabindex</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>type</name> + <classname>java.lang.String</classname> + <description>The content type of the resource designated by this hyperlink</description> + </property> + + <property> + <name>onblur</name> + <classname>java.lang.String</classname> + <description>JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onfocus</name> + <classname>java.lang.String</classname> + <description>JavaScript code. The onfocus event occurs when an element gets focus</description> + </property> + + <property> + <name>target</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the name of a frame where a document is to be opened. + + By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements + </description> + </property> + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_button_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,8 @@ +<properties> + &html_control_attributes; + <property> + <name>type</name> + <classname>java.lang.String</classname> + <description>submit|reset|image|button This attribute specifies a type of control to create. The default value for this attribute is "submit"</description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,28 @@ +<properties> + <property> + <name>accesskey</name> + <classname>java.lang.String</classname> + <description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note: Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>alt</name> + <classname>java.lang.String</classname> + <description>For a user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description> + </property> + <property> + <name>disabled</name> + <classname>boolean</classname> + <description>When set for a form control, this boolean attribute disables the control for user input</description> + </property> + + <property> + <name>size</name> + <classname>int</classname> + <description>This attribute tells the user agent the initial width of the control. The width is given in pixels except when type attribute has the value "text" or "password". In that case, its value refers to the (integer) number of characters</description> + </property> + <property> + <name>tabindex</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_control_events.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,20 @@ +<properties> +  + <property> + <name>onblur</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; the element lost the focus</description> + </property> + <property> + <name>onfocus</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; the element got the focus</description> + </property> + <property> + <name>onchange</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; the element value was changed</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_events.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,54 @@ +<properties> +  + <property> + <name>onclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is clicked</description> + </property> + <property> + <name>ondblclick</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer button is double-clicked</description> + </property> + <property> + <name>onkeydown</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed down</description> + </property> + <property> + <name>onkeypress</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is pressed and released</description> + </property> + <property> + <name>onkeyup</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a key is released</description> + </property> + <property> + <name>onmousedown</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is pressed down</description> + </property> + <property> + <name>onmousemove</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved within</description> + </property> + <property> + <name>onmouseout</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved away</description> + </property> + <property> + <name>onmouseover</name> + <classname>java.lang.String</classname> + <description>HTML: a script expression; a pointer is moved onto</description> + </property> + <property> + <name>onmouseup</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; a pointer button is released</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_form_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,40 @@ +<properties> + <property> + <name>accept</name> + <classname>java.lang.String</classname> + <description>This attribute specifies a comma-separated list of content types that a server processing this form will handle correctly. User agents may use this information to filter out non-conforming files when prompting a user to select files to be sent to the server (cf. the INPUT element when type="file")</description> + </property> + <property> + <name>acceptCharset</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the list of character encodings for input data that is accepted by the server processing this form. The value is a space- and/or comma-delimited list of charset values. The client must interpret this list as an exclusive-or list, i.e., the server is able to accept any single character encoding per entity received. + + The default value for this attribute is the reserved string "UNKNOWN". User agents may interpret this value as the character encoding that was used to transmit the document containing this FORM element + </description> + </property> + <property> + <name>enctype</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the content type used to submit the form to the server (when the value of method is "post"). The default value for this attribute is "application/x-www-form-urlencoded". The value "multipart/form-data" should be used in combination with the INPUT element, type="file"</description> + </property> + <property> + <name>onreset</name> + <classname>java.lang.String</classname> + <description>The onreset event occurs when a form is reset. It only applies to the FORM element</description> + </property> + <property> + <name>onsubmit</name> + <classname>java.lang.String</classname> + <description>The onsubmit event occurs when a form is submitted. It only applies to the FORM element</description> + </property> + <property> + <name>target</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the name of a frame where a document is to be opened. + + By assigning a name to a frame via the name attribute, authors can refer to it as the "target" of links defined by other elements + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_img_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,31 @@ +<properties> + <property> + <name>align</name> + <classname>java.lang.String</classname> + <description>bottom|middle|top|left|right + Deprecated. This attribute specifies the position of an IMG, OBJECT, or APPLET with respect to its context. + + The following values for align concern the object's position with respect to surrounding text: + + * bottom: means that the bottom of the object should be vertically aligned with the current baseline. This is the default value. + * middle: means that the center of the object should be vertically aligned with the current baseline. + * top: means that the top of the object should be vertically aligned with the top of the current text line + </description> + </property> + <property> + <name>border</name> + <classname>java.lang.String</classname> + <description>Deprecated. This attribute specifies the width of an IMG or OBJECT border, in pixels. The default value for this attribute depends on the user agent</description> + </property> + <property> + <name>hspace</name> + <classname>java.lang.String</classname> + <description>Deprecated. This attribute specifies the amount of white space to be inserted to the left and right of an IMG, APPLET, or OBJECT. The default value is not specified, but is generally a small, non-zero length</description> + </property> + <property> + <name>vspace</name> + <classname>java.lang.String</classname> + <description>Deprecated. This attribute specifies the amount of white space to be inserted above and below an IMG, APPLET, or OBJECT. The default value is not specified, but is generally a small, non-zero length</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +<properties> + &html_control_attributes; + + + <property> + <name>align</name> + <classname>java.lang.String</classname> + <description>left|center|right|justify [CI] + Deprecated. This attribute specifies the horizontal alignment of its element with respect to the surrounding context. Possible values: + + * left: text lines are rendered flush left. + * center: text lines are centered. + * right: text lines are rendered flush right. + * justify: text lines are justified to both margins. + + The default depends on the base text direction. For left to right text, the default is align=left, while for right to left text, the default is align=right + </description> + </property> + <property> + <name>maxlength</name> + <classname>int</classname> + <description>When the type attribute has the value "text" or "password", this attribute specifies the maximum number of characters the user may enter. This number may exceed the specified size, in which case the user agent should offer a scrolling mechanism. The default value for this attribute is an unlimited number</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_checkbox_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,45 @@ +<properties> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an access key</description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname> <description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_events.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,8 @@ +<properties> + &html_control_events; + <property> + <name>onselect</name> + <classname>java.lang.String</classname> + <description>HTML: script expression; The onselect event occurs when a user selects some text in a text field. This attribute may be used with the INPUT and TEXTAREA elements</description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_help_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,9 @@ +<properties> + + + <property> + <name>helpText</name><classname>java.lang.String</classname><description>Makes tiptext appear over an item when the mouse is hovered over it</description> + </property> + <property> + <name>selectText</name><classname>java.lang.String</classname><description>Selects text in the field</description> + </properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_input_radio_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,45 @@ +<properties> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_label_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,16 @@ +<properties> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_select_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,38 @@ +<properties> + + + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_style_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,14 @@ +<properties> + <property> + <name>style</name> + <classname>java.lang.String</classname> + <description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>styleClass</name> + <classname>java.lang.String</classname> + <description>Corresponds to the HTML class attribute</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_table_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,83 @@ +<properties> + <property> + <name>align</name> + <classname>java.lang.String</classname> + <description>left|center|right [CI] + Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: + + * left: The table is to the left of the document. + * center: The table is to the center of the document. + * right: The table is to the right of the document + + </description> + </property> + <property> + <name>border</name> + <classname>java.lang.String</classname> + <description>This attributes specifies the width (in pixels only) of the frame around a table</description> + </property> + <property> + <name>bgcolor</name> + <classname>java.lang.String</classname> + <description>Deprecated. This attribute sets the background color for the document body or table cells. + + This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element. + + This attribute has been deprecated in favor of style sheets for specifying background color information + </description> + </property> + <property> + <name>cellpadding</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is percentage length, the top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be equally separated from the content based on percentage of the available horizontal space + + </description> + </property> + <property> + <name>cellspacing</name> + <classname>java.lang.String</classname> + <description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description> + </property> + <property> + <name>frame</name> + <classname>java.lang.String</classname> + <description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI] + This attribute specifies which sides of the frame surrounding a table will be visible. Possible values: + + * void: No sides. This is the default value. + * above: The top side only. + * below: The bottom side only. + * hsides: The top and bottom sides only. + * vsides: The right and left sides only. + * lhs: The left-hand side only. + * rhs: The right-hand side only. + * box: All four sides. + * border: All four sides + + </description> + </property> + <property> + <name>rules</name> + <classname>java.lang.String</classname> + <description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values: + + * none: No rules. This is the default value. + * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only. + * rows: Rules will appear between rows only. + * cols: Rules will appear between columns only. + * all: Rules will appear between all rows and columns + </description> + </property> + <property> + <name>summary</name> + <classname>java.lang.String</classname> + <description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description> + </property> + <property> + <name>width</name> + <classname>java.lang.String</classname> + <description>This attribute specifies the desired width of the entire table and is intended for visual user agents. When the value is percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_textarea_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,48 @@ +<properties> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>cols</name><classname>java.lang.String</classname><description>Number of columns</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>rows</name><classname>java.lang.String</classname><description>Number of rows</description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/html_universal_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,23 @@ +<properties> + &html_style_attributes; + <property> + <name>dir</name> + <classname>java.lang.String</classname> + <description> + Direction indication for text that does not inherit + directionality. Valid values are "LTR" (left-to-right) + and "RTL" (right-to-left) + </description> + </property> + <property> + <name>lang</name> + <classname>java.lang.String</classname> + <description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>title</name> + <classname>java.lang.String</classname> + <description> Advisory title information about markup elements generated for this component</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_img_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,39 @@ +<properties> + <property> + <name>alt</name> + <classname>java.lang.String</classname> + <description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The language of the alternate text is specified by the lang attribute</description> + </property> + <property> + <name>height</name> + <classname>java.lang.String</classname> + <description> Image and object height override. + + When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values + </description> + </property> + <property> + <name>ismap</name> + <classname>boolean</classname> + <description>Flag indicating that this image is to be used as a server side image map. Such an image must be enclosed within a hyperlink ("a")</description> + </property> + <property> + <name>longdesc</name> + <classname>java.lang.String</classname> + <description>URI to a long description of the image represented by this element</description> + </property> + + + <property> + <name>usemap</name> + <classname>java.lang.String</classname> + <description> The name of a client side image map (an HTML "map" element) for which this element provides the image</description> + </property> + <property> + <name>width</name> + <classname>java.lang.String</classname> + <description>Image and object width override. When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/spec_table_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,24 @@ +<properties> + + <property> + <name>columnClasses</name> + <classname>java.lang.String</classname> + <description> Comma-delimited list of CSS style classes that are be applied to the columns of this table. A space separated list of classes may also be specified for any individual column. If the number of elements in this list is less than the number of columns specified in the "columns" attribute, no "class" attribute is output for each column greater than the number of elements in the list. If the number of elements in the list is greater than the number of columns specified in the "columns" attribute, the elements at the position in the list after the value of the "columns" attribute are ignored</description> + </property> + <property> + <name>footerClass</name> + <classname>java.lang.String</classname> + <description>Space-separated list of CSS style class(es) that are be applied to any footer generated for this table</description> + </property> + <property> + <name>headerClass</name> + <classname>java.lang.String</classname> + <description> Space-separated list of CSS style class(es) that are be applied to any header generated for this table</description> + </property> + <property> + <name>rowClasses</name> + <classname>java.lang.String</classname> + <description> A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. The styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_button_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,120 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property attachedstate="true"> + <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at the application action to be invoked, if this UIComponent is activated by the user, during the Apply Request Values or Invoke Application phase of the request processing lifecycle, depending on the value of the immediate property</description> + </property> + <property attachedstate="true"> + <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at method accepting an ActionEvent with return type void</description> + </property> + <property> + <name>immediate</name><classname>java.lang.String</classname><description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description> + </property> + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The + + language of the alternate text is specified by the lang attribute. + </description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description> + </property> + <property> + <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>type</name><classname>java.lang.String</classname><description> The content type of the resource designated by this component</description> + </property> + + + <property> + <name>image</name><classname>java.lang.String</classname> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_command_link_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,120 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean/description> + </property> + + <property attachedstate="true"> + <name>action</name><classname>java.lang.String</classname><description>MethodBinding pointing at an application action to be invoked, if this UIComponent is activated manually, during the Apply Request Values or Invoke Application phase of a request processing lifecycle, depending on a value of an immediate property</description> + </property> + <property attachedstate="true"> + <name>actionListener</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method accepting ActionEvent and returning type void</description> + </property> + <property> + <name>immediate</name><classname>java.lang.String</classname><description>True means, that the default ActionListener should be executed immediately (i.e. during Apply Request Values phase of the request processing lifecycle), rather than waiting until the Invoke Application phase</description> + </property> + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>charset</name><classname>java.lang.String</classname><description>The character encoding of the resource designated by this hyperlink</description> + </property> + <property> + <name>coords</name><classname>java.lang.String</classname><description>This attribute specifies the position and shape on the screen. The number and order of values depends on the shape being defined. Possible combinations: + + <property> + <name>hreflang</name><classname>java.lang.String</classname><description>Base language of a resource specified with the href attribute; hreflang may only be used with href</description> + </property> + + <property> + <name>rel</name><classname>java.lang.String</classname><description>The relationship from the current document to the anchor specified by this hyperlink. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>rev</name><classname>java.lang.String</classname><description>A reverse link from the anchor specified by this hyperlink to the current document. The value of this attribute is a space-separated list of link types</description> + </property> + <property> + <name>shape</name><classname>java.lang.String</classname><description>default|rect|circle|poly [CI] + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>type</name><classname>java.lang.String</classname><description> The content type of the resource designated by this hyperlink</description> + </property> + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>target</name><classname>java.lang.String</classname><description> This attribute specifies the name of a frame where a document is to be opened. + + + + </properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_data_table_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,181 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s)is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + + <property> + <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI] + Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: + + * left: The table is to the left of the document. + * center: The table is to the center of the document. + * right: The table is to the right of the document + + </description> + </property> + <property> + <name>border</name><classname>java.lang.String</classname><description>This attributes specifies the width (in pixels only) of the frame around a table </description> + </property> + <property> + <name>bgcolor</name><classname>java.lang.String</classname><description>Deprecated. This attribute sets the background color for the document body or table cells. + + This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element. + + This attribute has been deprecated in favor of style sheets for specifying background color information + </description> + </property> + <property> + <name>cellpadding</name><classname>java.lang.String</classname><description> This + attribute specifies the amount of space between the border of the cell and its contents. + If the value of this attribute is a pixel length, all four margins should be this + distance from the contents. If the value of the attribute is percentage length, the + top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be + equally separated from the content based on percentage of the available horizontal space + + </description> + </property> + <property> + <name>cellspacing</name><classname>java.lang.String</classname><description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>frame</name><classname>java.lang.String</classname><description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI] + This attribute specifies which sides of the frame surrounding a table will be visible. Possible values: + + * void: No sides. This is the default value. + * above: The top side only. + * below: The bottom side only. + * hsides: The top and bottom sides only. + * vsides: The right and left sides only. + * lhs: The left-hand side only. + * rhs: The right-hand side only. + * box: All four sides. + * border: All four sides + + </description> + </property> + <property> + <name>rules</name><classname>java.lang.String</classname><description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values: + + * none: No rules. This is the default value. + * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only. + * rows: Rules will appear between rows only. + * cols: Rules will appear between columns only. + * all: Rules will appear between all rows and columns + </description> + </property> + <property> + <name>summary</name><classname>java.lang.String</classname><description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description> + </property> + <property> + <name>width</name><classname>java.lang.String</classname><description>This attribute specifies the desired width of the entire table and is intended for visual user agents. When the value is percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent</description> + </property> + + + <property> + <name>value</name><classname>java.lang.String</classname><description>Supported types see JSF Spec 4.1.3</description> + </property> + <property> + <name>var</name><classname>java.lang.String</classname><description> + The request-scope attribute under which the data object for the + current row will be exposed when iterating + </description> + </property> + <property> + <name>rows</name><classname>java.lang.String</classname><description> + The number of rows to be displayed, or zero for all remaining + rows in the table. + </description> + </property> + <property> + <name>first</name><classname>java.lang.String</classname><description> + The zero-relative row number of the first row to be displayed + </description> + </property> + + <property> + <name>columnClasses</name><classname>java.lang.String</classname><description>Comma-separated list of CSS classes for columns</description> + </property> + <property> + <name>footerClass</name><classname>java.lang.String</classname><description>CSS class for the table footer</description> + </property> + <property> + <name>headerClass</name><classname>java.lang.String</classname><description>CSS class for the table header</description> + </property> + <property> + <name>rowClasses</name><classname>java.lang.String</classname><description>A comma-delimited list of CSS style classes that is applied to popup table rows</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_text_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,138 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI] + Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: + + * left: The table is to the left of the document. + * center: The table is to the center of the document. + * right: The table is to the right of the document + + </description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The + + language of the alternate text is specified by the lang attribute. + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>maxlength</name><classname>java.lang.String</classname><description>Maximum number of characters for text fields</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled. + </description> + </property> + <property> + <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_input_textarea_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,132 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>cols</name><classname>java.lang.String</classname><description>Number of columns</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled. + <property> + <name>rows</name><classname>java.lang.String</classname><description>Number of rows</description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + + + </properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_message_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,113 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>for</name><classname>java.lang.String</classname><description>The client identifier of the component for which this component represents associated message(s)</description> + </property> + <property> + <name>showSummary</name><classname>java.lang.String</classname><description>Indicates whether the summary of the associated message(s) should be displayed. + Default is: true + </description> + </property> + <property> + <name>showDetail</name><classname>java.lang.String</classname><description>Indicates whether the detail of the associated message(s) should be displayed. + Default is: false + </description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>infoClass</name><classname>java.lang.String</classname><description>CSS class to be used for messages with severity "INFO"</description> + </property> + <property> + <name>infoStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "INFO"</description> + </property> + <property> + <name>warnClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "WARN"</description> + </property> + <property> + <name>warnStyle</name><classname>java.lang.String</classname><description>CSS style is to be used for messages with severity "WARN"</description> + </property> + <property> + <name>errorClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "ERROR"</description> + </property> + <property> + <name>errorStyle</name><classname>java.lang.String</classname><description>CSS style is to be used for messages with severity "ERROR"</description> + </property> + <property> + <name>fatalClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "FATAL"</description> + </property> + <property> + <name>fatalStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "FATAL"</description> + </property> + <property> + <name>tooltip</name><classname>java.lang.String</classname><description> + If "true", the message summary will be rendered as a tooltip (i.e. HTML title attribute) + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_messages_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,117 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>showSummary</name><classname>java.lang.String</classname><description>Indicates whether the summary of the message(s) should be displayed. + Default is: true + </description> + </property> + <property> + <name>showDetail</name><classname>java.lang.String</classname><description>Indicates whether the detail of the message(s) should be displayed. + Default is: false + </description> + </property> + <property> + <name>globalOnly</name><classname>java.lang.String</classname><description>Indicates whether only global messages (that is, messages with no associated client identifier) should be rendered. + Default is: false + </description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendere</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>infoClass</name><classname>java.lang.String</classname><description>CSS class to be used for messages with severity "INFO"</description> + </property> + <property> + <name>infoStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "INFO"</description> + </property> + <property> + <name>warnClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "WARN"</description> + </property> + <property> + <name>warnStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "WARN"</description> + </property> + <property> + <name>errorClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "ERROR"</description> + </property> + <property> + <name>errorStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "ERROR"</description> + </property> + <property> + <name>fatalClass</name><classname>java.lang.String</classname><description>CSS class is to be used for messages with severity "FATAL"</description> + </property> + <property> + <name>fatalStyle</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be used for messages with severity "FATAL"</description> + </property> + <property> + <name>layout</name><classname>java.lang.String</classname><description>The layout: "table" or "list". Default: list</description> + </property> + <property> + <name>tooltip</name><classname>java.lang.String</classname><description> + If "true", the message summary will be rendered as a tooltip (i.e. HTML title attribute) + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_label_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,94 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + + + <property> + <name>for</name><classname>java.lang.String</classname><description> + The client identifier of the component for which this component + represents associated message(s) + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_output_text_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,82 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>escape</name><classname>java.lang.String</classname><description> + Indicates whether rendered markup should be escaped. + Default: true + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_grid_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,155 @@ +<properties> + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of a backing bean</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>align</name><classname>java.lang.String</classname><description>left|center|right [CI] + Deprecated. This attribute specifies the position of the table with respect to the document. Permitted values: + + * left: The table is to the left of the document. + * center: The table is to the center of the document. + * right: The table is to the right of the document + + </description> + </property> + <property> + <name>border</name><classname>java.lang.String</classname><description>This attributes specifies the width (in pixels only) of the frame around a table</description> + </property> + <property> + <name>bgcolor</name><classname>java.lang.String</classname><description> Deprecated. This attribute sets the background color for the document body or table cells. + + This attribute sets the background color of the canvas for the document body (the BODY element) or for tables (the TABLE, TR, TH, and TD elements). Additional attributes for specifying text color can be used with the BODY element. + + This attribute has been deprecated in favor of style sheets for specifying background color information + </description> + </property> + <property> + <name>cellpadding</name><classname>java.lang.String</classname><description> This attribute specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is percentage length, the top and bottom margins should be equally separated from the content based on percentage of the available vertical space, and the left and right margins should be equally separated from the content based on percentage of the available horizontal space + + </description> + </property> + <property> + <name>cellspacing</name><classname>java.lang.String</classname><description>This attribute specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells</description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>frame</name><classname>java.lang.String</classname><description>void|above|below|hsides|lhs|rhs|vsides|box|border [CI] + This attribute specifies which sides of the frame surrounding a table will be visible. Possible values: + + * void: No sides. This is the default value. + * above: The top side only. + * below: The bottom side only. + * hsides: The top and bottom sides only. + * vsides: The right and left sides only. + * lhs: The left-hand side only. + * rhs: The right-hand side only. + * box: All four sides. + * border: All four sides + + </description> + </property> + <property> + <name>rules</name><classname>java.lang.String</classname><description>This attribute specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. Possible values: + + * none: No rules. This is the default value. + * groups: Rules will appear between row groups (see THEAD, TFOOT, and TBODY) and column groups (see COLGROUP and COL) only. + * rows: Rules will appear between rows only. + * cols: Rules will appear between columns only. + * all: Rules will appear between all rows and columns + </description> + </property> + <property> + <name>summary</name><classname>java.lang.String</classname><description>This attribute provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille</description> + </property> + <property> + <name>width</name><classname>java.lang.String</classname><description>Image and object width override. When specified, the width and height attributes tell user agents to override the natural image or object size in favor of these values</description> + </property> + + + <property> + <name>columnClasses</name><classname>java.lang.String</classname> + </property> + <property> + <name>columns</name><classname>java.lang.String</classname> + </property> + <property> + <name>footerClass</name><classname>java.lang.String</classname> + </property> + <property> + <name>headerClass</name><classname>java.lang.String</classname> + </property> + <property> + <name>rowClasses</name><classname>java.lang.String</classname> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_panel_group_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,63 @@ +<properties> + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description>Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_boolean_checkbox_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,85 @@ +<properties> + + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_checkbox_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,146 @@ +<properties> + + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The + + language of the alternate text is specified by the lang attribute + </description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + + <property> + <name>layout</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.9</description> + </property> + + <property> + <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class is for enabled elements</description> + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_listbox_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,134 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component will not be rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) is/are to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + + <property> + <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description> + </property> + <property> + <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class is for enabled elements</description> + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_many_menu_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,130 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of a request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description>A Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to apply when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description>An advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + + + <property> + <name>onblur</name><classname>java.lang.String</classname><description>A JavaScript code. The onblur event occurs when an element loses focus either by a pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description> + </property> + + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767.A User agents should ignore leading zeros</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>A flag indicating that this component prohibits + changes by a user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>enabledClass</name><classname>java.lang.String</classname><description>A CSS class for enabled elements</description> + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>A CSS class for disabled elements</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_listbox_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,134 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component is checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of a request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>An alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description>A code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to apply when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description>Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to an HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to a specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves a source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description> + </property> + + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + + <property> + <name>size</name><classname>java.lang.String</classname><description>see JSF Spec</description> + </property> + <property> + <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class for enabled elements</description> + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class for disabled elements</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_menu_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,130 @@ +<properties> + + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component's value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>Method Binding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + + + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description> + </property> + + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>enabledClass</name><classname>java.lang.String</classname><description>CSS class for enabled elements</description> + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class for disabled elements</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/standard_select_one_radio_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,148 @@ +<properties> + + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during Apply Request Values phase), rather than waiting until a Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that will be called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + + <property> + <name>dir</name><classname>java.lang.String</classname><description>Alternate textual description of the element rendered by this component</description> + </property> + <property> + <name>lang</name><classname>java.lang.String</classname><description> Code describing the language used in the generated markup for this component</description> + </property> + <property> + <name>style</name><classname>java.lang.String</classname><description>CSS style(s) to be applied when this component is rendered</description> + </property> + <property> + <name>title</name><classname>java.lang.String</classname><description> Advisory title information about markup elements generated for this component</description> + </property> + <property> + <name>styleClass</name><classname>java.lang.String</classname><description>Corresponds to the HTML class attribute</description> + </property> + + + <property> + <name>onclick</name><classname>java.lang.String</classname><description>Defines a JavaScript onclick event handler</description> + </property> + <property> + <name>ondblclick</name><classname>java.lang.String</classname><description>Defines a JavaScript ondblclick event handler</description> + </property> + <property> + <name>onmousedown</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousedown event handler</description> + </property> + <property> + <name>onmouseup</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseup event handler</description> + </property> + <property> + <name>onmouseover</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseover event handler</description> + </property> + <property> + <name>onmousemove</name><classname>java.lang.String</classname><description>Defines a JavaScript onmousemove event handler</description> + </property> + <property> + <name>onmouseout</name><classname>java.lang.String</classname><description>Defines a JavaScript onmouseout event handler</description> + </property> + <property> + <name>onkeypress</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeypress event handler</description> + </property> + <property> + <name>onkeydown</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeydown event handler</description> + </property> + <property> + <name>onkeyup</name><classname>java.lang.String</classname><description>Defines a JavaScript onkeyup event handler</description> + </property> + + + <property> + <name>accesskey</name><classname>java.lang.String</classname><description>This attribute assigns an access key to an element. An access key is a single character from the document character set. Note. Authors should consider the input method of the expected reader when specifying an accesskey</description> + </property> + <property> + <name>alt</name><classname>java.lang.String</classname><description>For user agents that cannot display images, forms, or applets, this attribute specifies alternate text. The + + language of the alternate text is specified by the lang attribute + </description> + </property> + <property> + <name>datafld</name><classname>java.lang.String</classname><description>Retrieves which field of a given data source, as specified by the dataSrc property, to bind to the specified object</description> + </property> + <property> + <name>datasrc</name><classname>java.lang.String</classname><description>Retrieves the source of the data for data binding</description> + </property> + <property> + <name>dataformatas</name><classname>java.lang.String</classname><description>Indicates whether the bound data is plain text or HTML</description> + </property> + <property> + <name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description> + </property> + <property> + <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description> + </property> + <property> + <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description> + </property> + <property> + <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code </description> + </property> + <property> + <name>onselect</name><classname>java.lang.String</classname><description>An element is selected</description> + </property> + <property> + <name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit + changes by the user. The element may receive focus + unless it has also been disabled + </description> + </property> + <property> + <name>tabindex</name><classname>java.lang.String</classname><description>This attribute specifies the position of the current element in the tabbing order for the current document. This value must be a number between 0 and 32767. User agents should ignore leading zeros</description> + </property> + + + <property> + <name>layout</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.10</description> + </property> + <property> + <name>border</name><classname>java.lang.String</classname><description>see JSF Spec. 8.5.10</description> + </property> + <property> + <name>enabledClass</name><classname>java.lang.String</classname>standard_select_one_radio_attributes + </property> + <property> + <name>disabledClass</name><classname>java.lang.String</classname><description>CSS class is for disabled elements</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_column_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,5 @@ +<properties> + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_command_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,45 @@ +<properties> +  + + &ui_component_attributes; + + <property attachedstate="true"> + <name>action</name> + <classname>javax.faces.el.MethodBinding</classname> + <description> + MethodBinding pointing at the application action to be invoked, + if this UIComponent is activated by the user, during the Apply + Request Values or Invoke Application phase of the request + processing lifecycle, depending on the value of the immediate + property + </description> + <methodargs> </methodargs> + </property> + <property elonly="true" attachedstate="true"> + <name>actionListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description> + MethodBinding pointing at method accepting an ActionEvent with return type void + </description> + <methodargs>javax.faces.event.ActionEvent.class</methodargs> + </property> + <property> + <name>immediate</name> + <classname>boolean</classname> + <description> + True means, that the default ActionListener should be executed + immediately (i.e. during Apply Request Values phase of the + request processing lifecycle), rather than waiting until the + Invoke Application phase + </description> + </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + The current value for this component + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_component_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +<properties> +  + <property existintag="true" exist="true" el="false"> + <name>id</name> + <classname>java.lang.String</classname> + <description> + Every component may have a unique id that is automatically created if omitted + </description> + </property> + <property> + <name>rendered</name> + <classname>boolean</classname> + <description> + If "false", this component is not rendered + </description> + </property> + <property existintag="true" exist="true" el="true" elonly="true"> + <name>binding</name> + <classname>java.lang.String</classname> + <description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_data_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,37 @@ +<properties> + <property> + <name>first</name> + <classname>int</classname> + <description> + A zero-relative row number of the first row to display + </description> + </property> + <property> + <name>rows</name> + <classname>int</classname> + <description> + A number of rows to display, or zero for all remaining + rows in the table + </description> + </property> + <property> + <name>var</name> + <classname>java.lang.String</classname> + <description> + A request-scope attribute via which the data object for the + current row will be used when iterating + </description> + </property> + <property disabled="true"> + <name>rowIndex</name> + <description>An index of row</description> + </property> + <property disabled="true"> + <name>header</name> + <description>A header of a table</description> + </property> + <property disabled="true"> + <name>footer</name> + <description>A footer of a table</description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_for_attribute.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,13 @@ +<properties> +  + <property> + <name>for</name> + <classname>java.lang.String</classname> + <description><![CDATA[ + id (or full path of id's) of target components, for which this element must provide support. + If a target component inside of the same <code>NamingContainer</code> (UIForm, UIData in base implementations), can be simple value of the "id" attribute. + For other cases must include id's of <code>NamingContainer</code> components, separated by ':'. For search from the root of components, must be started with ':'. + ]]> + </description> + </property> +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_form_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,6 @@ +<properties> + + &ui_component_attributes; + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_graphic_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,11 @@ +<properties> + &ui_component_attributes; + <property> + <name>value</name> + <alias>url</alias> + <classname>java.lang.Object</classname> + <description>URL of the image (see JSF.4.1.5)</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_input_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,38 @@ +<properties> + &ui_output_attributes; + + <property> + <name>immediate</name> + <classname>boolean</classname> + <description> + A flag indicating that this component value must be converted + and validated immediately (that is, during Apply Request Values + phase), rather than waiting until a Process Validations phase + </description> + </property> + <property> + <name>required</name> + <classname>boolean</classname> + <description> + If "true", this component is checked for non-empty input + </description> + </property> + <property attachedstate="true"> + <name>validator</name> + <classname>javax.faces.el.MethodBinding</classname> + <methodargs> </methodargs> + <description> + MethodBinding pointing at a method that is called during + Process Validations phase of the request processing lifecycle, + to validate the current value of this component + </description> + </property> + <property attachedstate="true"> + <name>valueChangeListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <methodargs> </methodargs> + <description>Listener for value changes</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_message_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,32 @@ +<properties> + &ui_component_attributes; + <property> + <name>for</name> + <classname>java.lang.String</classname> + <description> + A client identifier of the component for which this component + represents associated message(s) + </description> + </property> + <property> + <name>showSummary</name> + <classname>boolean</classname> + <description> + Indicates whether the summary of associated message(s) + should be displayed. Default is: true + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>showDetail</name> + <classname>boolean</classname> + <description> + Indicates whether the detail of associated message(s) should + be displayed. Default is: false + </description> + <defaultvalue>false</defaultvalue> + </property> + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_messages_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,41 @@ +<properties> + &ui_component_attributes; + <property> + <name>for</name> + <classname>java.lang.String</classname> + <description> + A client identifier of the component for which this component + represents associated message(s) + </description> + </property> + <property> + <name>showSummary</name> + <classname>boolean</classname> + <description> + Indicates whether the summary of associated message(s) + should be displayed. Default is: true + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>showDetail</name> + <classname>boolean</classname> + <description> + Indicates whether the detail of the associated message(s) should + be displayed. Default is: false + </description> + <defaultvalue>false</defaultvalue> + </property> + <property> + <name>globalOnly</name> + <classname>boolean</classname> + <description> + Indicates whether only global messages (that is, messages with + no associated client identifier) should be rendered. Default is: + false + </description> + <defaultvalue>false</defaultvalue> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_output_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,19 @@ +<properties> + &ui_component_attributes; + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + The initial value to set when rendered for the first time + </description> + </property> + <property attachedstate="true"> + <name>converter</name> + <classname>javax.faces.convert.Converter</classname> + <description> + Id of Converter to be used or reference to a Converter + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_panel_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,13 @@ +<properties> + + + + &ui_component_attributes; + + <property> + <name>layout</name> + <classname>java.lang.String</classname> + <description>It defines a visual layout of a panel, it can be "block" or "inline"</description> + </property> + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_parameter_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,24 @@ +<properties> + &ui_component_attributes; +  + <property exist="true" existintag="true" hidden="true"> + <name>rendered</name> + <classname>boolean</classname> + <description> + If "false", this component isn't rendered + </description> + </property> + + <property> + <name>name</name> + <classname>java.lang.String</classname> + <description>A name of this parameter</description> + </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description>An initial value or a value binding</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_boolean_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,6 @@ +<properties> + &ui_input_attributes; + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_item_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,44 @@ +<properties> + &ui_component_attributes; +  + <property exist="true" existintag="true" hidden="true"> + <name>rendered</name> + <classname>boolean</classname> + <description> + If "false", this component isn't rendered + </description> + </property> + + <property> + <name>itemDisabled</name> + <classname>boolean</classname> + <description> + If "true", this component isn't saved during state saving + </description> + </property> + <property> + <name>itemDescription</name> + <classname>java.lang.String</classname> + <description>A description used by tools only</description> + </property> + <property> + <name>itemLabel</name> + <classname>java.lang.String</classname> + <description>A text shown by the item</description> + </property> + <property> + <name>itemValue</name> + <classname>java.lang.Object</classname> + <description>Item value, which is passed to the server as a request parameter</description> + </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + A value reference pointing at a javax.faces.model.SelectItem + instance + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_items_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,21 @@ +<properties> + &ui_component_attributes; +  + <property exist="true" existintag="true" hidden="true"> + <name>rendered</name> + <classname>boolean</classname> + <description> + If "false", this component isn't rendered + </description> + </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + A value reference pointing at a List or Array of + javax.faces.model.SelectItem instances + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_many_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,40 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have a unique id automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>The initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description>A flag indicating that this component value must be converted and validated immediately (that is, during an Apply Request Values phase), rather than waiting until a Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component is checked for a non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/ui_select_one_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,40 @@ +<properties> + + + + + + <property> + <name>id</name><classname>java.lang.String</classname><description>Every component may have an unique id. Automatically created if omitted</description> + </property> + <property> + <name>rendered</name><classname>java.lang.String</classname><description>If "false", this component isn't rendered</description> + </property> + <property> + <name>binding</name><classname>java.lang.String</classname><description>The attribute takes a value-binding expression for a component property of +a backing bean</description> + </property> + + <property> + <name>value</name><classname>java.lang.String</classname><description>Initial value to set when rendered for the first time</description> + </property> + <property> + <name>converter</name><classname>java.lang.String</classname><description>Id of Converter to be used or reference to a Converter</description> + </property> + + <property> + <name>immediate</name><classname>java.lang.String</classname><description> Flag indicating that this component value must be converted and validated immediately (that is, during an Apply Request Values phase), rather than waiting until Process Validations phase</description> + </property> + <property> + <name>required</name><classname>java.lang.String</classname><description>If "true", this component will be checked for non-empty input</description> + </property> + <property> + <name>validator</name><classname>java.lang.String</classname><description>MethodBinding pointing at a method that is called during a Process Validations phase of the request processing lifecycle, to validate the current value of this component</description> + </property> + <property> + <name>valueChangeListener</name><classname>java.lang.String</classname><description>Listener for value changes</description> + </property> + + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/user_role_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,22 @@ +<properties> + <property> + <name>enabledOnUserRole</name> + <classname>boolean</classname> + <description> + If a user is in the given role, this component is rendered + normally. If not, no hyperlink is rendered but all nested tags + (=body) are rendered + </description> + </property> + <property> + <name>visibleOnUserRole</name> + <classname>boolean</classname> + <description> + If a user is in given role, this component will be rendered + normally. If not, nothing is rendered and the body of this tag + is skipped + </description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/schema/entities/validator_min_max_attributes.ent 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,14 @@ +<properties> + <property> + <name>minimum</name> + <classname>int</classname> + <description>A minimum possible value within an optional range</description> + </property> + <property> + <name>maximum</name> + <classname>int</classname> + <description> A maximum within an optional range</description> + </property> + + +</properties> Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/VM_global_library.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ +#macro( quietnull $a) + +#if($a)$a#end + +#end + + + + + + + Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/component.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,202 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +#if(${generator.key}) + +import java.io.IOException; +import javax.faces.FacesException; +import org.ajax4jsf.framework.util.base64.Codec; +#end + +/** + * Component-Type ${component.name} + * Component-Family ${component.family} + #if(${component.renderer}) + * Renderer-Type ${component.renderer.name} + #end + * ${component.xmlEncodedDescription} + */ + public class $component.simpleClassName extends $component.superclass { + + public static final String COMPONENT_TYPE = "${component.name}"; + + /** + * Constructor to init default renderers + */ + public $component.simpleClassName (){ + #if(${component.renderer}) + setRendererType("${component.renderer.name}"); + #end + } + +// Component properties fields +#set( $fiedCounter = 1 ) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ + #if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated what $prop.name is set. + */ + private boolean _${prop.name}Set = false; + #set( $fiedCounter = $fiedCounter+2) + #else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ + #set( $fiedCounter = $fiedCounter+1) + #end +#end +#end + +// Getters-setters +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ){ + this._${prop.name} = __$prop.name; + #if($prop.simpleType) + this._${prop.name}Set = true; + #end + } + + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value bindings + */ + public $prop.simpleClassName ${prop.getterName}( ){ + #if($prop.simpleType) + if(this._${prop.name}Set){ + return this._${prop.name}; + } + ValueBinding vb = getValueBinding("${prop.name}"); + if (vb != null) { + ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext()); + if (null == value) { + return this._${prop.name}; + } + return (value.${prop.classname}Value()); + } else { + return (this._${prop.name}); + } + #else + if (null != this._${prop.name}) + { + return this._${prop.name}; + #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + } + ValueBinding vb = getValueBinding("${prop.name}"); + if (null != vb){ + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + #end + } else { + return ${prop.defaultvalue}; + } + #end + } + #if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}Raw( $prop.simpleClassName __$prop.name ){ + this._${prop.name} = __$prop.name; + } + /** + * ${prop.xmlEncodedDescription} + * Raw ( bypadd bindings ) Getter for $prop.name + * @return $prop.name value from local variable + */ + public $prop.simpleClassName ${prop.getterName}Raw( ){ + return this._${prop.name}; + } + #end + #end +#end + +#if( ${component.family} ) +// Component family. + public static final String COMPONENT_FAMILY = "${component.family}"; + + public String getFamily() { + return COMPONENT_FAMILY; + } +#end + +// Save state +// ----------------------------------------------------- StateHolder Methods + + + public Object saveState(FacesContext context) { + Object values[] = new Object[${fiedCounter}]; + values[0] = super.saveState(context); +#set($currentField = 1) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); + #set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); + #set( $currentField = $currentField+1) + #else + #if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; + #else + values[${currentField}] = saveAttachedState(context, _$prop.name ); + #end + #set( $currentField = $currentField+1) + #end + + #end +#end + return values; + } + + + public void restoreState(FacesContext context, Object state) { + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#set($currentField = 1) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); + #set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); + #set( $currentField = $currentField+1) + #else + #if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; + #else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); + #end + #set( $currentField = $currentField+1) + #end + + #end +#end + + + } +// Utilites + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/componentTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,149 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${component.classname}; + +public class $tag.simpleClassName extends $tag.superclass { + +// Fields +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + + #end +#end +// Setters +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( String __${prop.name} ){ + this._${prop.name} = __${prop.name}; + } + + #end + #if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ){ + this.${prop.setterName}(__${prop.alias}); + } + #end +#end +// Release + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release() + */ + public void release() + { + // TODO Auto-generated method stub + super.release(); +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + this._${prop.name} = null; + #end +#end + } + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent) + */ + protected void setProperties(UIComponent component) + { + // TODO Auto-generated method stub + super.setProperties(component); + +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + #if(!$prop.el) + if(isValueReference(this._${prop.name})){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}") + } + #end + #if($prop.name == "action") + setActionProperty(component, this._${prop.name}); + #elseif($prop.name == "actionListener") + setActionListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "converter") + setConverterProperty(component, this._${prop.name}); + #elseif($prop.name == "validator") + setValidatorProperty(component, this._${prop.name}); + #elseif($prop.name == "valueChangeListener") + setValueChangedListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "value") + setValueProperty(component, this._${prop.name}); + #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if(null != this._${prop.name}){ + if (isValueReference(this._${prop.name})) + { + MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, + new Class[]{${prop.methodargs}}); + ((${component.simpleClassName})component).${prop.setterName}(mb); + } + else + { + getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); + } + } + #else + // TODO - setup properties for other cases. + // name ${prop.name} with type $prop.classname + #end + #end +#end + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getComponentType() + */ + public String getComponentType() { + // TODO Auto-generated method stub + return "${component.name}"; + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getRendererType() + */ + public String getRendererType() { + #if($renderer) + return "${renderer.name}"; + #else + return null; + #end + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/componenttest.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,156 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import com.gargoylesoftware.htmlunit.Page; +import javax.faces.component.UIForm; +import javax.faces.component.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.component.UIViewRoot; + +import org.ajax4jsf.tests.MockValueBinding; + +//import ${component.classname}; +#if(${generator.key}) + +import java.io.IOException; +import javax.faces.FacesException; +import org.ajax4jsf.framework.util.base64.Codec; +#end + +public class $component.test.simpleClassName extends $component.test.superclassname { + +// public static final String COMPONENT_TYPE = "${component.name}"; + + +#set( $fiedCounter = 1 ) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + private boolean _${prop.name}Set = false; + #set( $fiedCounter = $fiedCounter+2) + #else + #set( $fiedCounter = $fiedCounter+1) + #end +#end +#end + + private $component.simpleClassName component; + private UIForm form; +// private FacesContext context; + + /** + * Constructor to init default renderers + */ + public $component.test.simpleClassName (String name){ + super(name); + } + + /* + * setup the tets + */ + public void setUp() throws Exception { + super.setUp(); + component = new ${component.simpleClassName}(); + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); + + component.setId("component"); +#foreach( $prop in $component.properties ) + #if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces.")) + component.${prop.setterName}($testDataGenerator.getTestData(${prop}) ); + #end +#end + + form.getChildren().add(component); + + } + + /* + * setup the tets + */ + public void tearDown() throws Exception{ + super.tearDown(); + component = null; + form = null; + } + + public void testComponent() throws Exception { + #if(${component.renderer}) + assertEquals("${component.renderer.name}", component.getRendererType()); + #end + +/* + HtmlPage renderedView = renderView(); + assertNotNull(renderedView); + System.out.println(renderedView.getWebResponse().getContentAsString()); + HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId()); + assertNotNull(element); +*/ +// values[0] = component.saveState(facesContext); + + } +/* + public void testDefaultValues(){ + + } +*/ + public void testContext(){ + + Object state = component.saveState(facesContext); +/* + UIViewRoot root = facesContext.getViewRoot(); + root.processDecodes(facesContext); + root.processValidators(facesContext); + root.processUpdates(facesContext); + root.processApplication(facesContext); +*/ + testRestoreState(state); + } + + public void testGetters() { + ${component.simpleClassName} component = new ${component.simpleClassName}(); + +#foreach( $prop in $component.properties ) + #if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces.")) + component.setValueBinding("${prop.name}", new MockValueBinding($testDataGenerator.getTestVeData(${prop}), ${testDataGenerator.getTestVeClass(${prop})}.class)); + assertEquals($testDataGenerator.getTestData(${prop}), component.${prop.getterName}()); + component.${prop.setterName}($testDataGenerator.getTestData1(${prop}) ); + assertEquals($testDataGenerator.getTestData1(${prop}), component.${prop.getterName}()); + #end +#end + + + } + + private void testRestoreState(Object state){ + ${component.simpleClassName} restoredComponent = new ${component.simpleClassName}(); + restoredComponent.restoreState(facesContext, state); + +#foreach( $prop in $component.properties ) + #if(!$prop.exist) + assertEquals(component.${prop.getterName}(), restoredComponent.${prop.getterName}()); + #end +#end + + } + + private void assertEquals(double d1, double d2) { + assertEquals(d1, d2, 0); + } + + private void assertEquals(float d1, float d2) { + assertEquals(d1, d2, 0); + } +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/converter.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,221 @@ +package $package; + +#foreach($import in $imports) +import $import ; +#end + + import javax.faces.context.FacesContext; + import javax.faces.el.ValueBinding; +import javax.faces.component.StateHolder; + + /** + * Converter-Id ${converter.id} + * ${converter.xmlEncodedDescription} + */ + +public class $converter.simpleClassName extends $converter.superclass #if(${converter.stateHolderRequired} && !${converter.superclassImplementsStateHolder})implements StateHolder#end + { + + public static final String CONVERTER_ID = "${converter.id}"; + + + + // Conveter properties fields + +#set( $fieldCounter = 0 ) + #foreach( $prop in $converter.properties ) + +#if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ + +#if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated that $prop.name is set. + */ + private boolean _${prop.name}Set = false; +#set( $fieldCounter = $fieldCounter+2) +#else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ +#set( $fieldCounter = $fieldCounter+1) + #end +#end +#end + + // Getters and setters + #foreach( $prop in $converter.properties ) + +#if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; + +#if($prop.simpleType) + this._${prop.name}Set = true; + +#end + } + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value binding + */ + public $prop.simpleClassName ${prop.getterName}() + { + ValueBinding vb = getValueBinding("${prop.name}"); + +#if($prop.simpleType) + if(this._${prop.name}Set) + { + return this._${prop.name}; + + return (this._${prop.name}); + } + } + +#else + if (null != this._${prop.name}) + { + return this._${prop.name}; + } + +#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + else if (null != vb) + { + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + } + +#end + else + { + return ${prop.defaultvalue}; + } + +#end + } + #if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + + { + return this._${prop.name}; + } + #end +#end +#end + +#if($converter.stateHolderRequired) + + // Save state + // ----------------------------------------------------- StateHolder Methods + + private boolean _transient; + +#if(${converter.superclassImplementsStateHolder}) +#set($currentField=1) +#set($fieldCounter = $fieldCounter+1) +#else +#set($currentField=0) +#end + public Object saveState(FacesContext context) { + +#if(${converter.superSaveStateMethodExists}) + Object values[] = new Object[${fieldCounter}]; + values[0] = super.saveState(context); +#else + Object values[] = new Object[${fieldCounter}]; +#end +#foreach( $prop in $converter.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); +#set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); +#set( $currentField = $currentField+1) +#else +#if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; +#else + values[${currentField}] = saveAttachedState(context, _$prop.name ); + #end + +#set( $currentField = $currentField+1) +#end +#end +#end + return values; + } + + +#if(${converter.superclassImplementsStateHolder}) +#set($currentField=1) +#else +#set($currentField=0) +#end + public void restoreState(FacesContext context, Object state) { +#if(${converter.superRestoreStateMethodExists}) + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#else + Object values[] = (Object[]) state; +#end +#foreach( $prop in $converter.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); +#set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); +#set( $currentField = $currentField+1) +#else +#if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; +#else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); + #end +#set( $currentField = $currentField+1) +#end + +#end +#end + } + +#if(!$converter.superIsTransientMethodExists) + public boolean isTransient() + { + return _transient; + } +#end + +#if(!$converter.superSetTransientMethodExists) + public void setTransient(boolean newTransientValue) + { + this._transient = newTransientValue; + } +#end + +#end + + // Utilites + + private FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } + + private ValueBinding getValueBinding(String name) + { + return getFacesContext().getApplication().createValueBinding(name); + } + + } Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/converterTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,95 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.convert.Converter; +import javax.faces.webapp.UIComponentTag; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import org.apache.commons.beanutils.ConvertUtils; +import javax.servlet.jsp.JspException; +import ${converter.classname}; + +public class $tag.simpleClassName extends $tag.superclass +{ + +// Fields +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + +#end +#end +// Setters +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}(String __${prop.name}) + { + this._${prop.name} = __${prop.name}; + } + +#end +#if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}(String __${prop.alias}) + { + this.${prop.setterName}(__${prop.alias}); + } +#end +#end + + protected Converter createConverter() throws JspException + { + ${converter.simpleClassName} converter = new ${converter.simpleClassName}(); + _setProperties(converter); + return converter; + } + + // Support method to wire in attributes + private void _setProperties(${converter.simpleClassName} converter) throws JspException + { + FacesContext facesContext = FacesContext.getCurrentInstance(); +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + if (_${prop.name} != null) + { +#if( ${prop.el} ) + if (UIComponentTag.isValueReference(_${prop.name})) + { + ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name}); + converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext)); + } +#if (!${prop.elonly}) + else + { + converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); + } +#end + } +#else + converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); +#end +#end +#end + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/facelets.taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> + <namespace>${taglib.uri}</namespace> + +${taglib.includeContent} + +#foreach( $component in ${components}) +#if($component.tag) + <tag> + <tag-name>${component.tag.name}</tag-name> + <component> + <component-type>${component.name}</component-type> +#if(${component.renderer}) + <renderer-type> + ${component.renderer.name} + </renderer-type> +#end +#if(${component.taghandler}) + <handler-class> + ${component.taghandler.classname} + </handler-class> +#end + </component> + + </tag> +#end +#end + + +#foreach( $listener in ${listeners}) + <tag> + <tag-name>${listener.name}</tag-name> +#if(${listener.taghandler}) + <handler-class> + ${listener.taghandler.classname} + </handler-class> +#end + + </tag> +#end + +</facelet-taglib> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/faces-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + +${facesConfig.includeContent} + +#foreach( $validator in ${validators}) + <validator> + <validator-id>${validator.id}</validator-id> + <validator-class>${validator.classname}</validator-class> + #if(${validator.description}) + <description>${validator.description}</description> + #end + #if(${validator.displayname}) + <display-name>${validator.displayname}</display-name> + #end + #if(${validator.icon}) + <icon>${validator.icon}</icon> + #end + </validator> +#end + +#foreach( $converter in ${converters}) + <converter> + #if(${converter.id}) + <converter-id>${converter.id}</converter-id> + #end + #if(${converter.forclass}) + <converter-for-class>${converter.forclass}</converter-for-class> + #end + + <converter-class>${converter.classname}</converter-class> + + #if(${converter.description}) + <description>${converter.description}</description> + #end + #if(${converter.displayname}) + <display-name>${converter.displayname}</display-name> + #end + #if(${converter.icon}) + <icon>${converter.icon}</icon> + #end + </converter> +#end + + + +#foreach( $component in ${components}) +#if( $component.generate ) + <component> + #if(${component.description}) + <description>${component.xmlEncodedDescription}</description> + #end + #if(${component.displayname}) + <display-name>${component.xmlEncodedDisplayname}</display-name> + #end + <component-type>${component.name}</component-type> + <component-class>${component.classname}</component-class> + +#foreach( $facet in $component.facets) + <facet> + #if(${facet.description}) + <description>${facet.xmlEncodedDescription}</description> + #end + #if(${facet.displayname}) + <display-name>${facet.xmlEncodedDisplayname}</display-name> + #end + <facet-name>${facet.name}</facet-name> + </facet> +#end + #if(${component.renderer}) + <component-extension> + <component-family>${component.family}</component-family> + <renderer-type>${component.renderer.name}</renderer-type> + </component-extension> + #end + </component> +#end +#end + +#foreach( $renderkit in $facesConfig.renderKits) + <render-kit> + #if(${renderkit.renderkitid}) + <render-kit-id>${renderkit.renderkitid}</render-kit-id> + #if(${renderkit.renderkitclass}) + <render-kit-class>${renderkit.renderkitclass}</render-kit-class> + #end + #end +#foreach( $component in $components) + #if($component.renderer) + #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) ) + #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}")) + <renderer> + <component-family>${component.family}</component-family> + <renderer-type> + ${component.renderer.name} + </renderer-type> + <renderer-class> + ${rendererClass} + </renderer-class> + </renderer> + #end + #end +#end + </render-kit> +#end + + +</faces-config> Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/listener_taghandler.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,101 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${listener.componentclass}; + +import java.io.IOException; + +import javax.faces.*; +import javax.faces.el.*; + +import javax.el.*; + +import com.sun.facelets.*; +import com.sun.facelets.el.*; +import com.sun.facelets.tag.*; +import com.sun.facelets.tag.jsf.*; + +public class $tag.simpleClassName extends TagHandler { + + private Class listenerType; + + private final TagAttribute type; + + private final TagAttribute binding; + + public ${tag.simpleClassName}(TagConfig config) { + super(config); + this.binding = this.getAttribute("binding"); + this.type = this.getAttribute("type"); + if (type != null) { + if (!type.isLiteral()) { + throw new TagAttributeException(this.tag, this.type, "Must be literal"); + } + try { + this.listenerType = Class.forName(type.getValue()); + } catch (Exception e) { + throw new TagAttributeException(this.tag, this.type, e); + } + } + } + + public void apply(FaceletContext ctx, UIComponent parent) + throws IOException, FacesException, FaceletException, ELException { + if (parent instanceof $listener.componentclass) { + // only process if parent was just created + if (parent.getParent() == null) { + ${listener.componentclass} src = (${listener.componentclass}) parent; + ${listener.listenerclass} listener = null; + ValueExpression ve = null; + if (this.binding != null) { + ve = this.binding.getValueExpression(ctx, + ${listener.listenerclass}.class); + listener = (${listener.listenerclass}) ve.getValue(ctx); + } + if (listener == null) { + try { + listener = (${listener.listenerclass}) listenerType.newInstance(); + } catch (Exception e) { + throw new TagAttributeException(this.tag, this.type, e.getCause()); + } + if (ve != null) { + ve.setValue(ctx, ve); + } + } + #foreach($prop in $listener.properties) + #if( !$prop.existintag ) + TagAttribute attribute; + #if( $prop.required ) + attribute = getRequiredAttribute("${prop.name}"); + #else + attribute = getAttribute("${prop.name}"); + #end + if (attribute != null) { + ValueBinding binding; + + binding = new LegacyValueBinding( + attribute.getValueExpression(ctx, + ${prop.classname}.class)); + + listener.${prop.setterName}(binding); + } + #end + #end + + src.${listener.methodname}(listener); + } + } else { + throw new TagException(this.tag, + "Parent is not of type ${listener.componentclass}, type is: " + parent); + } + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/renderer.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${package}; + +import ${component.classname}; +import ${renderer.superclass}; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:15 $ + * + */ +public class ${renderer.simpleClassName} extends ${renderer.superclass} { + + /** + * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + */ + protected Class getComponentClass() { + // Expected component class for rendering + return ${component.simpleClassName}.class; + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/resources-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> + +${resourcesConfig.includeContent} + +#foreach( $key in ${classResources.keySet()}) + <resource class="${classResources.get($key)}"> + <name>${key}</name> + </resource> +#end + +#foreach( $key in ${pathResources.keySet()}) + <resource> + <name>${key}</name> + <path>${pathResources.get($key)}</path> + </resource> +#end +</resource-config> Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/tag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,154 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${component.classname}; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $ + * + */ +public class $tag.simpleClassName extends $tag.superclass { + +// Fields +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + + #end +#end +// Setters +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( String __${prop.name} ){ + this._${prop.name} = __${prop.name}; + } + + #end + #if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ){ + this.${prop.setterName}(__${prop.alias}); + } + #end +#end +// Release + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release() + */ + public void release() + { + // TODO Auto-generated method stub + super.release(); +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + this._${prop.name} = null; + #end +#end + } + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent) + */ + protected void setProperties(UIComponent component) + { + // TODO Auto-generated method stub + super.setProperties(component); + +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + #if(!$prop.el) + if(isValueReference(this._${prop.name})){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}"); + } + #end + #if($prop.name == "action") + setActionProperty(component, this._${prop.name}); + #elseif($prop.name == "actionListener") + setActionListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "converter") + setConverterProperty(component, this._${prop.name}); + #elseif($prop.name == "validator") + setValidatorProperty(component, this._${prop.name}); + #elseif($prop.name == "valueChangeListener") + setValueChangedListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "value") + setValueProperty(component, this._${prop.name}); + #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if(null != this._${prop.name}){ + if (isValueReference(this._${prop.name})) + { + MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, + new Class[]{${prop.methodargs}}); + ((${component.simpleClassName})component).${prop.setterName}(mb); + } + else + { + getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); + } + } + #else + // TODO - setup properties for other cases. + // name ${prop.name} with type $prop.classname + #end + #end +#end + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getComponentType() + */ + public String getComponentType() { + // TODO Auto-generated method stub + return "${component.name}"; + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getRendererType() + */ + public String getRendererType() { + #if($renderer) + return "${renderer.name}"; + #else + return null; + #end + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/taghandler.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,102 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${component.classname}; +import com.sun.facelets.tag.jsf.ComponentHandler; +import com.sun.facelets.tag.jsf.ComponentConfig; + +import com.sun.facelets.*; +import com.sun.facelets.el.*; +import com.sun.facelets.tag.*; +/** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:03 $ + * + */ +public class $tag.simpleClassName extends $tag.superclass { + + + private static final ${tag.simpleClassName}MetaRule metaRule = new ${tag.simpleClassName}MetaRule(); + + + + public ${tag.simpleClassName}(ComponentConfig config) + { + super(config); + } +// Metarule + protected MetaRuleset createMetaRuleset(Class type) + { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(metaRule); + return m; + } + + /** + * @author shura (latest modification by $Author: ishabalov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/20 20:58:03 $ + * + */ + static class ${tag.simpleClassName}MetaRule extends MetaRule{ + + /* (non-Javadoc) + * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget) + */ + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if (meta.isTargetInstanceOf(${component.simpleClassName}.class)) { + #foreach($prop in $component.properties) + #if( !$prop.existintag ) + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if ("${prop.name}".equals(name)) { + return new ${prop.name}Mapper(attribute); + } + + #end + #end + #end + } + return null; + } + + } + +#foreach($prop in $component.properties) +#if( !$prop.existintag ) + + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + + static class ${prop.name}Mapper extends Metadata { + + private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}}; + + private final TagAttribute _action; + /** + * @param attribute + */ + public ${prop.name}Mapper(TagAttribute attribute) { + _action = attribute; + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + ((${component.simpleClassName}) instance) + .${prop.setterName}(new LegacyMethodBinding(this._action + .getMethodExpression(ctx, null, + SIGNATURE))); + } + + } + #end + #end + #end +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>${taglib.tlibversion}</tlib-version> + <jsp-version>${taglib.jspversion}</jsp-version> +#if(${taglib.shortname}) + <short-name>${taglib.shortname}</short-name> +#end + <uri>${taglib.uri}</uri> +#if(${taglib.description}) + <description>${taglib.description}</description> +#end +${taglib.includeContent} + +#foreach( $component in ${components}) + #if($component.tag) + <tag> + <name>${component.tag.name}</name> + <tag-class>${component.tag.classname}</tag-class> + <body-content>${component.tag.bodyContent}</body-content> + #if(${component.tag.displayname}) + <display-name>${component.tag.xmlEncodedDisplayname}</display-name> + #elseif(${component.displayname}) + <display-name>${component.xmlEncodedDisplayname}</display-name> + #end + #if(${component.tag.description}) + <description>${component.tag.xmlEncodedDescription}</description> + #else + <description>${component.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${component.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + +#foreach( $validator in ${validators}) + #if($validator.tag) + <tag> + <name>${validator.tag.name}</name> + <tag-class>${validator.tag.classname}</tag-class> + <body-content>${validator.tag.bodyContent}</body-content> + #if(${validator.tag.displayname}) + <display-name>${validator.tag.xmlEncodedDisplayname}</display-name> + #elseif(${validator.displayname}) + <display-name>${validator.xmlEncodedDisplayname}</display-name> + #end + #if(${validator.tag.description}) + <description>${validator.tag.xmlEncodedDescription}</description> + #elseif(${validator.xmlEncodedDescription}) + <description>${validator.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${validator.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + +#foreach( $converter in ${converters}) + #if($converter.tag) + <tag> + <name>${converter.tag.name}</name> + <tag-class>${converter.tag.classname}</tag-class> + <body-content>${converter.tag.bodyContent}</body-content> + #if(${converter.tag.displayname}) + <display-name>${converter.tag.xmlEncodedDisplayname}</display-name> + #elseif(${converter.displayname}) + <display-name>${converter.xmlEncodedDisplayname}</display-name> + #end + #if(${converter.tag.description}) + <description>${converter.tag.xmlEncodedDescription}</description> + #elseif(${converter.xmlEncodedDescription}) + <description>${converter.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${converter.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + + + +</taglib> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/tagtest.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,173 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.webapp.UIComponentTag; +import ${component.classname}; +import javax.faces.application.Application; +import javax.faces.el.ValueBinding; +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.el.ExpressionEvaluator; +import javax.servlet.jsp.el.VariableResolver; +import javax.servlet.jsp.tagext.Tag; +import java.io.IOException; +import java.util.Enumeration; + + + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $ + * + */ +public class $tag.test.simpleClassName extends $tag.test.superclassname { + + + private $tag.simpleClassName tag; + + /** + * Constructor to init default renderers + */ + public ${tag.test.simpleClassName} (String name){ + super(name); + } + + + public void setUp() throws Exception { + super.setUp(); + tag = new ${tag.simpleClassName}(); + tag.setParent(new UIComponentTag(){ + + public String getComponentType() { + // TODO Auto-generated method stub + return null; + } + + public String getRendererType() { + // TODO Auto-generated method stub + return null; + } + + public int doStartTag() throws JspException { + // TODO Auto-generated method stub + return Tag.EVAL_BODY_INCLUDE; + } + + public int doEndTag() throws JspException { + // TODO Auto-generated method stub + return Tag.EVAL_BODY_INCLUDE; + } + + }); + + } + + public void tearDown() throws Exception { + super.tearDown(); + tag = null; + } + + + public void testSetPropertiesUIComponent() { + ${component.simpleClassName} component = new ${component.simpleClassName}(); + // create binding + Application application = null; + ValueBinding binding = null; + + #foreach( $prop in $tag.properties ) + #if($prop.el) + application = facesContext.getApplication(); + binding = application.createValueBinding(component.getOnclick()); + component.setValueBinding("${prop.name}", binding); + #if($prop.classname == "java.lang.String") + component.${prop.setterName}( " __$prop.name" ); + #elseif($prop.classname == "java.lang.Boolean") + component.${prop.setterName}( new Boolean(true) ); + #end + #end + //tag.${prop.setterName}("__${prop.name}"); + #end + + tag.setProperties(component); + +/* + #foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + #if(!$prop.el) + if(isValueReference(this._${prop.name})){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}") + } + #end + #if($prop.name == "action") + + setActionProperty(component, tag._${prop.name}); + #elseif($prop.name == "actionListener") + setActionListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "converter") + setConverterProperty(component, this._${prop.name}); + #elseif($prop.name == "validator") + setValidatorProperty(component, this._${prop.name}); + #elseif($prop.name == "valueChangeListener") + setValueChangedListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "value") + setValueProperty(component, this._${prop.name}); + #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if(null != this._${prop.name}){ + if (isValueReference(this._${prop.name})) + { + MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, + new Class[]{${prop.methodargs}}); + ((${component.simpleClassName})component).${prop.setterName}(mb); + } + else + { + getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); + } + } + #else + // TODO - setup properties for other cases. + // name ${prop.name} with type $prop.classname + #end + #end + #end +*/ + } + + public void testGetRendererType(){ + assertNotNull(tag.getRendererType()); + } + + public void testGetComponentType(){ + assertNotNull(tag.getComponentType()); + } + + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/ComponentTemplate.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,109 @@ +/** + * 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 + */ + +#if($component.packageName) +package $component.packageName; +#end + +#if($component.imports) + +// +// Imports +// +#foreach( $import in $component.imports ) +import $import; +#end +// +// +// + +#else +import java.util.Iterator; +import java.util.Collection; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; +import org.ajax4jsf.framework.renderer.ComponentVariables; +#end + +#if($component.fullBaseclass) +import $component.fullBaseclass; +#else +import org.ajax4jsf.framework.renderer.RendererBase; +#end + +#if($component.baseclassName) +#set( $baseclassname = $component.baseclassName ) +#else +#set( $baseclassname = "RendererBase" ) +#end + + +/** + * Renderer for component class ${component.fullClassName} + */ +public class $component.className extends $baseclassname { + + public $component.className () { + super(); + } + +#if( $component.declarations ) + // + // Declarations + // +#foreach( $declaration in $component.declarations ) + $declaration +#end + // + // + // +#end + + + private String convertToString(Object obj ) { + return ( obj == null ? "" : obj.toString() ); + } + private String convertToString(boolean b ) { + return String.valueOf(b); + } + private String convertToString(int b ) { + return b!=Integer.MIN_VALUE?String.valueOf(b):""; + } + private String convertToString(long b ) { + return b!=Long.MIN_VALUE?String.valueOf(b):""; + } + + /** + * Get base component class, targetted for this renderer. Used for check arguments in decode/encode. + * @return + */ + protected Class getComponentClass() { +#if($component.componentClass) + return ${component.componentClass}.class; +#else + return UIComponent.class; +#end + } Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeBegin.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,10 @@ + + public void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component ) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeBegin(writer, context, (${component.componentClass})component, variables ); + } + + public void doEncodeBegin(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables ) throws IOException { + $body + } + \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeChildren.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,16 @@ + + public void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeChildren(writer, context, (${component.componentClass})component, variables ); + } + + public void doEncodeChildren(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException { + ${body} + } + + /* (non-Javadoc) + * @see javax.faces.render.Renderer#getRendersChildren() + */ + public boolean getRendersChildren() { + return true; + } Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/EncodeEnd.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ + + public void doEncodeEnd(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException { + ${body} + } + + public void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeEnd(writer, context, (${component.componentClass})component, variables ); + + ComponentsVariableResolver.removeVariables(this, component); + } + Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_1.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,3 @@ +Collection com_$index = (Collection)$items; +for (Iterator iter = com_$index .iterator(); iter.hasNext();) { + variables.setVariable("$item", iter.next()); \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/FORElement_2.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,5 @@ +for ( + variables.setVariable("$item", $from); + Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString()).intValue(); + variables.addValueToVariable("$item", new Integer(1) ) + ) { \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/HTMLElement.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,32 @@ +writer.startElement("$htmlTag", component); +#if($htmlAttributes) +#foreach( $key in $htmlAttributes.keySet() ) + #set ( $attr = $htmlAttributes.get($key) ) + #if ( $attr.code ) + $attr.code + #else + #if ( $attr.value ) +getUtils().writeAttribute(writer, "$attr.name", $attr.value ); + #end + #end +#end +#end +#if($passThruAttributes) +// +// pass thru attributes +// +#set( $passThruLength = ${passThruAttributes.size()}) +getUtils().encodeAttributesFromArray(context,component,new String[] { +#foreach( $attribute in $passThruAttributes ) + "$attribute" #if( $velocityCount < $passThruLength ), + #end +#end +}); +// +// +// +#end +#if($htmlText) +writer.write( convertToString($htmlText) ); +writer.flush(); +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/IFElement.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,2 @@ +if ( Boolean.valueOf( String.valueOf($if) ).booleanValue() ) { + Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/headerResource.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,48 @@ +private final InternetResource[] ${property} = { + #set ($count = 0) + #foreach($resource in $resourceKeys) + #if($count > 0) + , + #end + #set ($count = $count + 1) + ${resource} + #end +}; + +private InternetResource[] ${property}All = null; + +${getterModifier} InternetResource[] ${propertyGetterName}() { + synchronized (this) { + if (${property}All == null) { + InternetResource[] rsrcs = super.${propertyGetterName}(); + boolean ignoreSuper = rsrcs == null || rsrcs.length == 0; + boolean ignoreThis = ${property} == null || ${property}.length == 0; + + if (ignoreSuper) { + if (ignoreThis) { + ${property}All = new InternetResource[0]; + } else { + ${property}All = ${property}; + } + } else { + if (ignoreThis) { + ${property}All = rsrcs; + } else { + java.util.Set rsrcsSet = new java.util.LinkedHashSet(); + + for (int i = 0; i < rsrcs.length; i++ ) { + rsrcsSet.add(rsrcs[i]); + } + + for (int i = 0; i < ${property}.length; i++ ) { + rsrcsSet.add(${property}[i]); + } + + ${property}All = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]); + } + } + } + } + + return ${property}All; +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertCall.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,5 @@ +#if ($variableName) +variables.setVariable("$variableName", $function); +#else +$function; +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertChildren.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ +#if(${$ELIndex} || ${$ELVar}) +#if(${$ELIndex}) +Integer indexChildren_$indexChildren = (Integer)ComponentUtils.evaluateExpression(facesContext, "$ELIndex"); +if (null != indexChildren_$indexChildren ) { + UIComponent component_$indexChildren = (UIComponent)component.getChildren().get(indexChildren_$indexChildren .intValue()); + renderChild(context, component_$indexChildren ); +} +#else + UIComponent component_$indexChildren = (UIComponent)evaluateExpression( "$ELVar" ); + renderChild(context, component_$indexChildren ); +#end +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertComponent.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1 @@ +renderChild(context, (UIComponent)$value ); Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertFacet.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +UIComponent indexChildren_$index = component.getFacet("$FacetName"); +if (null != indexChildren_$index && indexChildren_$index .isRendered()) { + renderChild(context, indexChildren_$index); +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/insertResource.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1 @@ +variables.setVariable("$variable", getResource( "$resourceURI" ).getUri(context, component) ); Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/set.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1 @@ +variables.setVariable("$variable", $expression ); \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/tags.bin ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/templatecompiler/velocity.properties 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,3 @@ +resource.loader = classpath,antfile +classpath.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.ClasspathTemplateLoader +antfile.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/validator.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,232 @@ +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.component.StateHolder; + +/** + * Validator-Id ${validator.id} + * ${validator.xmlEncodedDescription} + */ +public class $validator.simpleClassName extends $validator.superclass #if(${validator.stateHolderRequired} && !${validator.superclassImplementsStateHolder})implements StateHolder#end +{ + + public static final String VALIDATOR_ID = "${validator.id}"; + + /** + * Default no-args contstructor + */ + public $validator.simpleClassName () + { + } + +// Validator properties fields +#set( $fieldCounter = 0 ) +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ +#if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated that $prop.name is set. + */ + private boolean _${prop.name}Set = false; +#set( $fieldCounter = $fieldCounter+2) +#else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ +#set( $fieldCounter = $fieldCounter+1) +#end +#end +#end + +// Getters and setters +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; +#if($prop.simpleType) + this._${prop.name}Set = true; +#end + } + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value binding + */ + public $prop.simpleClassName ${prop.getterName}() + { + ValueBinding vb = getValueBinding(_${prop.name}); +#if($prop.simpleType) + if(this._${prop.name}Set) + { + return this._${prop.name}; + } + if (vb != null) + { + ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext()); + if (null == value) + { + return this._${prop.name}; + } + //return (value.${prop.classname}Value()); + } else + { + return (this._${prop.name}); + } + } +#else + if (null != this._${prop.name}) + { + return this._${prop.name}; + } +#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + else if (null != vb) + { + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + } +#end + else + { + return ${prop.defaultvalue}; + } + } +#end +#if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}Raw( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; + } + /* + * ${prop.xmlEncodedDescription} + * Raw ( bypadd bindings ) Getter for $prop.name + * @return $prop.name value from local variable + */ + public $prop.simpleClassName ${prop.getterName}Raw() + { + return this._${prop.name}; + } +#end +#end +#end + + +#if($validator.stateHolderRequired) + + // Save state + // ----------------------------------------------------- StateHolder Methods + + private boolean _transient; +#if(${validator.superclassImplementsStateHolder}) +#set($currentField=1) +#set( $fieldCounter = $fieldCounter+1) +#else +#set($currentField=0) +#end + public Object saveState(FacesContext context) { +#if(${validator.superSaveStateMethodExists}) + Object values[] = new Object[${fieldCounter}]; + values[0] = super.saveState(context); +#else + Object values[] = new Object[${fieldCounter}]; +#end +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); +#set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); +#set( $currentField = $currentField+1) +#else +#if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; +#else + values[${currentField}] = saveAttachedState(context, _$prop.name ); +#end +#set( $currentField = $currentField+1) +#end +#end +#end + return values; + } + +#if(${validator.superclassImplementsStateHolder}) +#set($currentField=1) +#else +#set($currentField=0) +#end + public void restoreState(FacesContext context, Object state) { +#if(${validator.superRestoreStateMethodExists}) + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#else + Object values[] = (Object[]) state; +#end +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); +#set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); +#set( $currentField = $currentField+1) +#else +#if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; +#else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); +#end +#set( $currentField = $currentField+1) +#end + +#end +#end + } + +#if(!$validator.superIsTransientMethodExists) + public boolean isTransient() + { + return _transient; + } +#end + +#if(!$validator.superSetTransientMethodExists) + public void setTransient(boolean newTransientValue) + { + this._transient = newTransientValue; + } +#end + +#end + + +// Utilites + + private FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } + + private ValueBinding getValueBinding(String name) + { + return getFacesContext().getApplication().createValueBinding(name); + } + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates/validatorTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,96 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.webapp.UIComponentTag; +import javax.faces.validator.Validator; +import org.apache.commons.beanutils.ConvertUtils; +import javax.faces.context.FacesContext; +import javax.servlet.jsp.JspException; +import javax.faces.el.ValueBinding; +import ${validator.classname}; + +public class $tag.simpleClassName extends $tag.superclass { + + //private String validatorId = "${validator.id}"; + + +// Fields +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + +#end +#end +// Setters +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( String __${prop.name} ) + { + this._${prop.name} = __${prop.name}; + } + +#end +#if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ) + { + this.${prop.setterName}(__${prop.alias}); + } +#end +#end + + protected Validator createValidator() throws JspException + { + ${validator.simpleClassName} validator = new ${validator.simpleClassName}(); + _setProperties(validator); + return validator; + } + + // Support method to wire in properties + private void _setProperties(${validator.simpleClassName} validator) throws JspException + { + FacesContext facesContext = FacesContext.getCurrentInstance(); +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + if (_${prop.name} != null) + { +#if( ${prop.el} ) + if (UIComponentTag.isValueReference(_${prop.name})) + { + ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name}); + validator.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext)); + } +#if (!${prop.elonly}) + else + { + validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); + } +#end + } +#else + validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); +#end +#end +#end + } +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/component.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,202 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +#if(${generator.key}) + +import java.io.IOException; +import javax.faces.FacesException; +import org.ajax4jsf.framework.util.base64.Codec; +#end + +/** + * Component-Type ${component.name} + * Component-Family ${component.family} + #if(${component.renderer}) + * Renderer-Type ${component.renderer.name} + #end + * ${component.xmlEncodedDescription} + */ + public class $component.simpleClassName extends $component.superclass { + + public static final String COMPONENT_TYPE = "${component.name}"; + + /** + * Constructor to init default renderers + */ + public $component.simpleClassName (){ + #if(${component.renderer}) + setRendererType("${component.renderer.name}"); + #end + } + +// Component properties fields +#set( $fiedCounter = 1 ) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ + #if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated what $prop.name is set. + */ + private boolean _${prop.name}Set = false; + #set( $fiedCounter = $fiedCounter+2) + #else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ + #set( $fiedCounter = $fiedCounter+1) + #end +#end +#end + +// Getters-setters +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ){ + this._${prop.name} = __$prop.name; + #if($prop.simpleType) + this._${prop.name}Set = true; + #end + } + + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value bindings + */ + public $prop.simpleClassName ${prop.getterName}( ){ + #if($prop.simpleType) + if(this._${prop.name}Set){ + return this._${prop.name}; + } + ValueBinding vb = getValueBinding("${prop.name}"); + if (vb != null) { + ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext()); + if (null == value) { + return this._${prop.name}; + } + return (value.${prop.classname}Value()); + } else { + return (this._${prop.name}); + } + #else + if (null != this._${prop.name}) + { + return this._${prop.name}; + #if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + } + ValueBinding vb = getValueBinding("${prop.name}"); + if (null != vb){ + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + #end + } else { + return ${prop.defaultvalue}; + } + #end + } + #if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}Raw( $prop.simpleClassName __$prop.name ){ + this._${prop.name} = __$prop.name; + } + /** + * ${prop.xmlEncodedDescription} + * Raw ( bypadd bindings ) Getter for $prop.name + * @return $prop.name value from local variable + */ + public $prop.simpleClassName ${prop.getterName}Raw( ){ + return this._${prop.name}; + } + #end + #end +#end + +#if( ${component.family} ) +// Component family. + public static final String COMPONENT_FAMILY = "${component.family}"; + + public String getFamily() { + return COMPONENT_FAMILY; + } +#end + +// Save state +// ----------------------------------------------------- StateHolder Methods + + + public Object saveState(FacesContext context) { + Object values[] = new Object[${fiedCounter}]; + values[0] = super.saveState(context); +#set($currentField = 1) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); + #set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); + #set( $currentField = $currentField+1) + #else + #if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; + #else + values[${currentField}] = saveAttachedState(context, _$prop.name ); + #end + #set( $currentField = $currentField+1) + #end + + #end +#end + return values; + } + + + public void restoreState(FacesContext context, Object state) { + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#set($currentField = 1) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); + #set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); + #set( $currentField = $currentField+1) + #else + #if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; + #else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); + #end + #set( $currentField = $currentField+1) + #end + + #end +#end + + + } +// Utilites + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componentTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,149 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${component.classname}; + +public class $tag.simpleClassName extends $tag.superclass { + +// Fields +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + + #end +#end +// Setters +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + /** + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( String __${prop.name} ){ + this._${prop.name} = __${prop.name}; + } + + #end + #if( $prop.alias) + /** + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ){ + this.${prop.setterName}(__${prop.alias}); + } + #end +#end +// Release + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#release() + */ + public void release() + { + // TODO Auto-generated method stub + super.release(); +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + this._${prop.name} = null; + #end +#end + } + + /* (non-Javadoc) + * @see org.ajax4jsf.components.taglib.html.HtmlCommandButtonTagBase#setProperties(javax.faces.component.UIComponent) + */ + protected void setProperties(UIComponent component) + { + // TODO Auto-generated method stub + super.setProperties(component); + +#foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + #if(!$prop.el) + if(isValueReference(this._${prop.name})){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}") + } + #end + #if($prop.name == "action") + setActionProperty(component, this._${prop.name}); + #elseif($prop.name == "actionListener") + setActionListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "converter") + setConverterProperty(component, this._${prop.name}); + #elseif($prop.name == "validator") + setValidatorProperty(component, this._${prop.name}); + #elseif($prop.name == "valueChangeListener") + setValueChangedListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "value") + setValueProperty(component, this._${prop.name}); + #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if(null != this._${prop.name}){ + if (isValueReference(this._${prop.name})) + { + MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, + new Class[]{${prop.methodargs}}); + ((${component.simpleClassName})component).${prop.setterName}(mb); + } + else + { + getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); + } + } + #else + // TODO - setup properties for other cases. + // name ${prop.name} with type $prop.classname + #end + #end +#end + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getComponentType() + */ + public String getComponentType() { + // TODO Auto-generated method stub + return "${component.name}"; + } + + /* (non-Javadoc) + * @see javax.faces.webapp.UIComponentTag#getRendererType() + */ + public String getRendererType() { + #if($renderer) + return "${renderer.name}"; + #else + return null; + #end + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/componenttest.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,159 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import com.gargoylesoftware.htmlunit.Page; +import javax.faces.component.UIForm; +import javax.faces.component.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.component.UIViewRoot; + +import org.ajax4jsf.tests.MockValueBinding; + +//import ${component.classname}; +#if(${generator.key}) + +import java.io.IOException; +import javax.faces.FacesException; +import org.ajax4jsf.framework.util.base64.Codec; +#end + +public class $component.test.simpleClassName extends $component.test.superclassname { + +// public static final String COMPONENT_TYPE = "${component.name}"; + + +#set( $fiedCounter = 1 ) +#foreach( $prop in $component.properties ) + #if( !$prop.exist ) + #if($prop.simpleType) + private boolean _${prop.name}Set = false; + #set( $fiedCounter = $fiedCounter+2) + #else + #set( $fiedCounter = $fiedCounter+1) + #end +#end +#end + + private $component.simpleClassName component; + private UIForm form; +// private FacesContext context; + + /** + * Constructor to init default renderers + */ + public $component.test.simpleClassName (String name){ + super(name); + } + + /* + * setup the tets + */ + public void setUp() throws Exception { + super.setUp(); + component = new ${component.simpleClassName}(); + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); + + component.setId("component"); +#foreach( $prop in $component.properties ) + #if(!$prop.exist && $prop.name != "value") + #if($prop.classname == "java.lang.String") + component.${prop.setterName}( " __$prop.name" ); + #elseif($prop.classname == "java.lang.Boolean") + component.${prop.setterName}( new Boolean(true) ); + #end + #end +#end + + form.getChildren().add(component); + + } + + /* + * setup the tets + */ + public void tearDown() throws Exception{ + super.tearDown(); + component = null; + form = null; + } + + public void testComponent() throws Exception { + #if(${component.renderer}) + assertEquals("${component.renderer.name}", component.getRendererType()); + #end +/* + HtmlPage renderedView = renderView(); + assertNotNull(renderedView); + System.out.println(renderedView.getWebResponse().getContentAsString()); + HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId()); + assertNotNull(element); +*/ +// values[0] = component.saveState(facesContext); + + } +/* + public void testDefaultValues(){ + + } +*/ + public void testContext(){ + + Object state = component.saveState(facesContext); +/* + UIViewRoot root = facesContext.getViewRoot(); + root.processDecodes(facesContext); + root.processValidators(facesContext); + root.processUpdates(facesContext); + root.processApplication(facesContext); +*/ + testRestoreState(state); + } + + public void testGetters() { + ${component.simpleClassName} component = new ${component.simpleClassName}(); + +#foreach( $prop in $component.properties ) + #if(!$prop.exist && !$prop.elonly && !$prop.classname.startsWith("javax.faces.")) + component.setValueBinding("${prop.name}", new MockValueBinding($testDataGenerator.getTestVeData(${prop}), ${testDataGenerator.getTestVeClass(${prop})}.class)); + assertEquals($testDataGenerator.getTestData(${prop}), component.${prop.getterName}()); + component.${prop.setterName}($testDataGenerator.getTestData1(${prop}) ); + assertEquals($testDataGenerator.getTestData1(${prop}), component.${prop.getterName}()); + #end +#end + + + } + + private void testRestoreState(Object state){ + ${component.simpleClassName} restoredComponent = new ${component.simpleClassName}(); + restoredComponent.restoreState(facesContext, state); + +#foreach( $prop in $component.properties ) + #if(!$prop.exist) + assertEquals(component.${prop.getterName}(), restoredComponent.${prop.getterName}()); + #end +#end + + } + + private void assertEquals(double d1, double d2) { + assertEquals(d1, d2, 0); + } + + private void assertEquals(float d1, float d2) { + assertEquals(d1, d2, 0); + } +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converter.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,221 @@ +package $package; + +#foreach($import in $imports) +import $import ; +#end + + import javax.faces.context.FacesContext; + import javax.faces.el.ValueBinding; +import javax.faces.component.StateHolder; + + /** + * Converter-Id ${converter.id} + * ${converter.xmlEncodedDescription} + */ + +public class $converter.simpleClassName extends $converter.superclass #if(${converter.stateHolderRequired} && !${converter.superclassImplementsStateHolder})implements StateHolder#end + { + + public static final String CONVERTER_ID = "${converter.id}"; + + + + // Conveter properties fields + +#set( $fieldCounter = 0 ) + #foreach( $prop in $converter.properties ) + +#if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ + +#if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated that $prop.name is set. + */ + private boolean _${prop.name}Set = false; +#set( $fieldCounter = $fieldCounter+2) +#else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ +#set( $fieldCounter = $fieldCounter+1) + #end +#end +#end + + // Getters and setters + #foreach( $prop in $converter.properties ) + +#if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; + +#if($prop.simpleType) + this._${prop.name}Set = true; + +#end + } + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value binding + */ + public $prop.simpleClassName ${prop.getterName}() + { + ValueBinding vb = getValueBinding("${prop.name}"); + +#if($prop.simpleType) + if(this._${prop.name}Set) + { + return this._${prop.name}; + + return (this._${prop.name}); + } + } + +#else + if (null != this._${prop.name}) + { + return this._${prop.name}; + } + +#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + else if (null != vb) + { + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + } + +#end + else + { + return ${prop.defaultvalue}; + } + +#end + } + #if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + + { + return this._${prop.name}; + } + #end +#end +#end + +#if($converter.stateHolderRequired) + + // Save state + // ----------------------------------------------------- StateHolder Methods + + private boolean _transient; + +#if(${converter.superclassImplementsStateHolder}) +#set($currentField=1) +#set($fieldCounter = $fieldCounter+1) +#else +#set($currentField=0) +#end + public Object saveState(FacesContext context) { + +#if(${converter.superSaveStateMethodExists}) + Object values[] = new Object[${fieldCounter}]; + values[0] = super.saveState(context); +#else + Object values[] = new Object[${fieldCounter}]; +#end +#foreach( $prop in $converter.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); +#set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); +#set( $currentField = $currentField+1) +#else +#if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; +#else + values[${currentField}] = saveAttachedState(context, _$prop.name ); + #end + +#set( $currentField = $currentField+1) +#end +#end +#end + return values; + } + + +#if(${converter.superclassImplementsStateHolder}) +#set($currentField=1) +#else +#set($currentField=0) +#end + public void restoreState(FacesContext context, Object state) { +#if(${converter.superRestoreStateMethodExists}) + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#else + Object values[] = (Object[]) state; +#end +#foreach( $prop in $converter.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); +#set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); +#set( $currentField = $currentField+1) +#else +#if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; +#else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); + #end +#set( $currentField = $currentField+1) +#end + +#end +#end + } + +#if(!$converter.superIsTransientMethodExists) + public boolean isTransient() + { + return _transient; + } +#end + +#if(!$converter.superSetTransientMethodExists) + public void setTransient(boolean newTransientValue) + { + this._transient = newTransientValue; + } +#end + +#end + + // Utilites + + private FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } + + private ValueBinding getValueBinding(String name) + { + return getFacesContext().getApplication().createValueBinding(name); + } + + } Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/converterTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,95 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.convert.Converter; +import javax.faces.webapp.UIComponentTag; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import org.apache.commons.beanutils.ConvertUtils; +import javax.servlet.jsp.JspException; +import ${converter.classname}; + +public class $tag.simpleClassName extends $tag.superclass +{ + +// Fields +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + +#end +#end +// Setters +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}(String __${prop.name}) + { + this._${prop.name} = __${prop.name}; + } + +#end +#if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}(String __${prop.alias}) + { + this.${prop.setterName}(__${prop.alias}); + } +#end +#end + + protected Converter createConverter() throws JspException + { + ${converter.simpleClassName} converter = new ${converter.simpleClassName}(); + _setProperties(converter); + return converter; + } + + // Support method to wire in attributes + private void _setProperties(${converter.simpleClassName} converter) throws JspException + { + FacesContext facesContext = FacesContext.getCurrentInstance(); +#foreach( $prop in $converter.properties ) +#if( !$prop.existintag ) + if (_${prop.name} != null) + { +#if( ${prop.el} ) + if (UIComponentTag.isValueReference(_${prop.name})) + { + ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name}); + converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext)); + } +#if (!${prop.elonly}) + else + { + converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); + } +#end + } +#else + converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); +#end +#end +#end + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/facelets.taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> + <namespace>${taglib.uri}</namespace> + +${taglib.includeContent} + +#foreach( $component in ${components} ) + #if($component.tag) + <tag> + <tag-name>${component.tag.name}</tag-name> + <component> + <component-type>${component.name}</component-type> + #if(${component.renderer}) + <renderer-type>${component.renderer.name}</renderer-type> + #end + #if(${component.taghandler}) + <handler-class>${component.taghandler.classname}</handler-class> + #end + </component> + </tag> + #end +#end + +#foreach( $validator in ${validators}) +#if($validator.tag) + <tag> + <tag-name>${validator.tag.name}</tag-name> + <validator> + <validator-id>${validator.id}</validator-id> +#if(${validator.taghandler}) + <handler-class>${validator.taghandler.classname}</handler-class> +#end + </validator> + </tag> +#end +#end + +#foreach( $converter in ${converters} ) +#if($converter.tag) + <tag> + <tag-name>${converter.tag.name}</tag-name> + <converter> + <converter-id>${converter.id}</converter-id> +#if(${converter.taghandler}) + <handler-class>${converter.taghandler.classname}</handler-class> +#end + </converter> + </tag> +#end +#end + + +#foreach( $listener in ${listeners}) + <tag> + <tag-name>${listener.name}</tag-name> +#if(${listener.taghandler}) + <handler-class> + ${listener.taghandler.classname} + </handler-class> +#end + + </tag> +#end + +</facelet-taglib> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/faces-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + +${facesConfig.includeContent} + +#foreach( $validator in ${validators}) + <validator> + <validator-id>${validator.id}</validator-id> + <validator-class>${validator.classname}</validator-class> + #if(${validator.description}) + <description>${validator.description}</description> + #end + #if(${validator.displayname}) + <display-name>${validator.displayname}</display-name> + #end + #if(${validator.icon}) + <icon>${validator.icon}</icon> + #end + </validator> +#end + +#foreach( $converter in ${converters}) + <converter> + #if(${converter.id}) + <converter-id>${converter.id}</converter-id> + #end + #if(${converter.forclass}) + <converter-for-class>${converter.forclass}</converter-for-class> + #end + + <converter-class>${converter.classname}</converter-class> + + #if(${converter.description}) + <description>${converter.description}</description> + #end + #if(${converter.displayname}) + <display-name>${converter.displayname}</display-name> + #end + #if(${converter.icon}) + <icon>${converter.icon}</icon> + #end + </converter> +#end + + + +#foreach( $component in ${components}) +#if( $component.generate ) + <component> + #if(${component.description}) + <description>${component.xmlEncodedDescription}</description> + #end + #if(${component.displayname}) + <display-name>${component.xmlEncodedDisplayname}</display-name> + #end + <component-type>${component.name}</component-type> + <component-class>${component.classname}</component-class> + +#foreach( $facet in $component.facets) + <facet> + #if(${facet.description}) + <description>${facet.xmlEncodedDescription}</description> + #end + #if(${facet.displayname}) + <display-name>${facet.xmlEncodedDisplayname}</display-name> + #end + <facet-name>${facet.name}</facet-name> + </facet> +#end + #if(${component.renderer}) + <component-extension> + <component-family>${component.family}</component-family> + <renderer-type>${component.renderer.name}</renderer-type> + </component-extension> + #end + </component> +#end +#end + +#foreach( $renderkit in $facesConfig.renderKits) + <render-kit> + #if(${renderkit.renderkitid}) + <render-kit-id>${renderkit.renderkitid}</render-kit-id> + #if(${renderkit.renderkitclass}) + <render-kit-class>${renderkit.renderkitclass}</render-kit-class> + #end + #end +#foreach( $component in $components) + #if($component.renderer) + #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) ) + #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}")) + <renderer> + <component-family>${component.family}</component-family> + <renderer-type> + ${component.renderer.name} + </renderer-type> + <renderer-class> + ${rendererClass} + </renderer-class> + </renderer> + #end + #end +#end + </render-kit> +#end + + +</faces-config> Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/listener_taghandler.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,101 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${listener.componentclass}; + +import java.io.IOException; + +import javax.faces.*; +import javax.faces.el.*; + +import javax.el.*; + +import com.sun.facelets.*; +import com.sun.facelets.el.*; +import com.sun.facelets.tag.*; +import com.sun.facelets.tag.jsf.*; + +public class $tag.simpleClassName extends TagHandler { + + private Class listenerType; + + private final TagAttribute type; + + private final TagAttribute binding; + + public ${tag.simpleClassName}(TagConfig config) { + super(config); + this.binding = this.getAttribute("binding"); + this.type = this.getAttribute("type"); + if (type != null) { + if (!type.isLiteral()) { + throw new TagAttributeException(this.tag, this.type, "Must be literal"); + } + try { + this.listenerType = Class.forName(type.getValue()); + } catch (Exception e) { + throw new TagAttributeException(this.tag, this.type, e); + } + } + } + + public void apply(FaceletContext ctx, UIComponent parent) + throws IOException, FacesException, FaceletException, ELException { + if (parent instanceof $listener.componentclass) { + // only process if parent was just created + if (parent.getParent() == null) { + ${listener.componentclass} src = (${listener.componentclass}) parent; + ${listener.listenerclass} listener = null; + ValueExpression ve = null; + if (this.binding != null) { + ve = this.binding.getValueExpression(ctx, + ${listener.listenerclass}.class); + listener = (${listener.listenerclass}) ve.getValue(ctx); + } + if (listener == null) { + try { + listener = (${listener.listenerclass}) listenerType.newInstance(); + } catch (Exception e) { + throw new TagAttributeException(this.tag, this.type, e.getCause()); + } + if (ve != null) { + ve.setValue(ctx, ve); + } + } + #foreach($prop in $listener.properties) + #if( !$prop.existintag ) + TagAttribute attribute; + #if( $prop.required ) + attribute = getRequiredAttribute("${prop.name}"); + #else + attribute = getAttribute("${prop.name}"); + #end + if (attribute != null) { + ValueBinding binding; + + binding = new LegacyValueBinding( + attribute.getValueExpression(ctx, + ${prop.classname}.class)); + + listener.${prop.setterName}(binding); + } + #end + #end + + src.${listener.methodname}(listener); + } + } else { + throw new TagException(this.tag, + "Parent is not of type ${listener.componentclass}, type is: " + parent); + } + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/renderer.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,25 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${package}; + +import ${component.classname}; +import ${renderer.superclass}; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:49 $ + * + */ +public class ${renderer.simpleClassName} extends ${renderer.superclass} { + + /** + * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass() + */ + protected Class getComponentClass() { + // Expected component class for rendering + return ${component.simpleClassName}.class; + } + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/resources-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> + +${resourcesConfig.includeContent} + +#foreach( $key in ${classResources.keySet()}) + <resource class="${classResources.get($key)}"> + <name>${key}</name> + </resource> +#end + +#foreach( $key in ${pathResources.keySet()}) + <resource> + <name>${key}</name> + <path>${pathResources.get($key)}</path> + </resource> +#end +</resource-config> Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taghandler.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,102 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ + +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import ${component.classname}; +import com.sun.facelets.tag.jsf.ComponentHandler; +import com.sun.facelets.tag.jsf.ComponentConfig; + +import com.sun.facelets.*; +import com.sun.facelets.el.*; +import com.sun.facelets.tag.*; +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:51 $ + * + */ +public class $tag.simpleClassName extends $tag.superclass { + + + private static final ${tag.simpleClassName}MetaRule metaRule = new ${tag.simpleClassName}MetaRule(); + + + + public ${tag.simpleClassName}(ComponentConfig config) + { + super(config); + } +// Metarule + protected MetaRuleset createMetaRuleset(Class type) + { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(metaRule); + return m; + } + + /** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:51 $ + * + */ + static class ${tag.simpleClassName}MetaRule extends MetaRule{ + + /* (non-Javadoc) + * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, com.sun.facelets.tag.TagAttribute, com.sun.facelets.tag.MetadataTarget) + */ + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if (meta.isTargetInstanceOf(${component.simpleClassName}.class)) { + #foreach($prop in $component.properties) + #if( !$prop.existintag ) + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if ("${prop.name}".equals(name)) { + return new ${prop.name}Mapper(attribute); + } + + #end + #end + #end + } + return null; + } + + } + +#foreach($prop in $component.properties) +#if( !$prop.existintag ) + + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + + static class ${prop.name}Mapper extends Metadata { + + private static final Class[] SIGNATURE = new Class[] {${prop.methodargs}}; + + private final TagAttribute _action; + /** + * @param attribute + */ + public ${prop.name}Mapper(TagAttribute attribute) { + _action = attribute; + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + ((${component.simpleClassName}) instance) + .${prop.setterName}(new LegacyMethodBinding(this._action + .getMethodExpression(ctx, null, + SIGNATURE))); + } + + } + #end + #end + #end +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>${taglib.tlibversion}</tlib-version> + <jsp-version>${taglib.jspversion}</jsp-version> +#if(${taglib.shortname}) + <short-name>${taglib.shortname}</short-name> +#end + <uri>${taglib.uri}</uri> +#if(${taglib.description}) + <description>${taglib.description}</description> +#end +${taglib.includeContent} + +#foreach( $component in ${components}) + #if($component.tag) + <tag> + <name>${component.tag.name}</name> + <tag-class>${component.tag.classname}</tag-class> + <body-content>${component.tag.bodyContent}</body-content> + #if(${component.tag.displayname}) + <display-name>${component.tag.xmlEncodedDisplayname}</display-name> + #elseif(${component.displayname}) + <display-name>${component.xmlEncodedDisplayname}</display-name> + #end + #if(${component.tag.description}) + <description>${component.tag.xmlEncodedDescription}</description> + #else + <description>${component.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${component.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + +#foreach( $validator in ${validators}) + #if($validator.tag) + <tag> + <name>${validator.tag.name}</name> + <tag-class>${validator.tag.classname}</tag-class> + <body-content>${validator.tag.bodyContent}</body-content> + #if(${validator.tag.displayname}) + <display-name>${validator.tag.xmlEncodedDisplayname}</display-name> + #elseif(${validator.displayname}) + <display-name>${validator.xmlEncodedDisplayname}</display-name> + #end + #if(${validator.tag.description}) + <description>${validator.tag.xmlEncodedDescription}</description> + #elseif(${validator.xmlEncodedDescription}) + <description>${validator.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${validator.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + +#foreach( $converter in ${converters}) + #if($converter.tag) + <tag> + <name>${converter.tag.name}</name> + <tag-class>${converter.tag.classname}</tag-class> + <body-content>${converter.tag.bodyContent}</body-content> + #if(${converter.tag.displayname}) + <display-name>${converter.tag.xmlEncodedDisplayname}</display-name> + #elseif(${converter.displayname}) + <display-name>${converter.xmlEncodedDisplayname}</display-name> + #end + #if(${converter.tag.description}) + <description>${converter.tag.xmlEncodedDescription}</description> + #elseif(${converter.xmlEncodedDescription}) + <description>${converter.xmlEncodedDescription}</description> + #end + #foreach( $prop in ${converter.properties} ) + #if( !${prop.hidden} && !${prop.disabled} ) + <attribute> + <name>${prop.name}</name> + #if(${prop.required}) + <required>true</required> + #end + <rtexprvalue>false</rtexprvalue> + <description>${prop.xmlEncodedDescription}</description> + </attribute> + #if( $prop.alias ) + <attribute> + <name>${prop.alias}</name> + <rtexprvalue>false</rtexprvalue> + <description>Alias for ${prop.name} : ${prop.xmlEncodedDescription}</description> + </attribute> + #end + #end + #end +</tag> +#end +#end + + + +</taglib> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/tagtest.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,173 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.webapp.UIComponentTag; +import ${component.classname}; +import javax.faces.application.Application; +import javax.faces.el.ValueBinding; +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.el.ExpressionEvaluator; +import javax.servlet.jsp.el.VariableResolver; +import javax.servlet.jsp.tagext.Tag; +import java.io.IOException; +import java.util.Enumeration; + + + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $ + * + */ +public class $tag.test.simpleClassName extends $tag.test.superclassname { + + + private $tag.simpleClassName tag; + + /** + * Constructor to init default renderers + */ + public ${tag.test.simpleClassName} (String name){ + super(name); + } + + + public void setUp() throws Exception { + super.setUp(); + tag = new ${tag.simpleClassName}(); + tag.setParent(new UIComponentTag(){ + + public String getComponentType() { + // TODO Auto-generated method stub + return null; + } + + public String getRendererType() { + // TODO Auto-generated method stub + return null; + } + + public int doStartTag() throws JspException { + // TODO Auto-generated method stub + return Tag.EVAL_BODY_INCLUDE; + } + + public int doEndTag() throws JspException { + // TODO Auto-generated method stub + return Tag.EVAL_BODY_INCLUDE; + } + + }); + + } + + public void tearDown() throws Exception { + super.tearDown(); + tag = null; + } + + + public void testSetPropertiesUIComponent() { + ${component.simpleClassName} component = new ${component.simpleClassName}(); + // create binding + Application application = null; + ValueBinding binding = null; + + #foreach( $prop in $tag.properties ) + #if($prop.el) + application = facesContext.getApplication(); + binding = application.createValueBinding(component.getOnclick()); + component.setValueBinding("${prop.name}", binding); + #if($prop.classname == "java.lang.String") + component.${prop.setterName}( " __$prop.name" ); + #elseif($prop.classname == "java.lang.Boolean") + component.${prop.setterName}( new Boolean(true) ); + #end + #end + //tag.${prop.setterName}("__${prop.name}"); + #end + + tag.setProperties(component); + +/* + #foreach( $prop in $component.properties ) + #if( !$prop.existintag ) + #if(!$prop.el) + if(isValueReference(this._${prop.name})){ + throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}") + } + #end + #if($prop.name == "action") + + setActionProperty(component, tag._${prop.name}); + #elseif($prop.name == "actionListener") + setActionListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "converter") + setConverterProperty(component, this._${prop.name}); + #elseif($prop.name == "validator") + setValidatorProperty(component, this._${prop.name}); + #elseif($prop.name == "valueChangeListener") + setValueChangedListenerProperty(component, this._${prop.name}); + #elseif($prop.name == "value") + setValueProperty(component, this._${prop.name}); + #elseif($prop.elOnly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + if(null != this._${prop.name}){ + if (isValueReference(this._${prop.name})) + { + MethodBinding mb = getFacesContext().getApplication().createMethodBinding(this._${prop.name}, + new Class[]{${prop.methodargs}}); + ((${component.simpleClassName})component).${prop.setterName}(mb); + } + else + { + getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); + } + } + #else + // TODO - setup properties for other cases. + // name ${prop.name} with type $prop.classname + #end + #end + #end +*/ + } + + public void testGetRendererType(){ + assertNotNull(tag.getRendererType()); + } + + public void testGetComponentType(){ + assertNotNull(tag.getComponentType()); + } + + +} Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validator.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,232 @@ +package $package; + +#foreach($import in $imports) +import $import ; +#end + +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.component.StateHolder; + +/** + * Validator-Id ${validator.id} + * ${validator.xmlEncodedDescription} + */ +public class $validator.simpleClassName extends $validator.superclass #if(${validator.stateHolderRequired} && !${validator.superclassImplementsStateHolder})implements StateHolder#end +{ + + public static final String VALIDATOR_ID = "${validator.id}"; + + /** + * Default no-args contstructor + */ + public $validator.simpleClassName () + { + } + +// Validator properties fields +#set( $fieldCounter = 0 ) +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) + /** + * $prop.name + * ${prop.xmlEncodedDescription} + */ +#if($prop.simpleType) + private $prop.simpleClassName _$prop.name = ${prop.defaultvalue}; + /** + * Flag indicated that $prop.name is set. + */ + private boolean _${prop.name}Set = false; +#set( $fieldCounter = $fieldCounter+2) +#else + private $prop.simpleClassName _$prop.name = null; /* Default is ${prop.defaultvalue}*/ +#set( $fieldCounter = $fieldCounter+1) +#end +#end +#end + +// Getters and setters +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) + /** + * ${prop.xmlEncodedDescription} + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; +#if($prop.simpleType) + this._${prop.name}Set = true; +#end + } + + /** + * ${prop.xmlEncodedDescription} + * Getter for $prop.name + * @return $prop.name value from local variable or value binding + */ + public $prop.simpleClassName ${prop.getterName}() + { + ValueBinding vb = getValueBinding(_${prop.name}); +#if($prop.simpleType) + if(this._${prop.name}Set) + { + return this._${prop.name}; + } + if (vb != null) + { + ${prop.boxingClass} value = (${prop.boxingClass}) vb.getValue(getFacesContext()); + if (null == value) + { + return this._${prop.name}; + } + //return (value.${prop.classname}Value()); + } else + { + return (this._${prop.name}); + } + } +#else + if (null != this._${prop.name}) + { + return this._${prop.name}; + } +#if( !$prop.isInstanceof("javax.faces.el.MethodBinding") && !$prop.isInstanceof("javax.faces.el.ValueBinding")) + else if (null != vb) + { + return (${prop.simpleClassName})vb.getValue(getFacesContext()); + } +#end + else + { + return ${prop.defaultvalue}; + } + } +#end +#if($prop.raw) + /** + * ${prop.xmlEncodedDescription} + * Raw Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}Raw( $prop.simpleClassName __$prop.name ) + { + this._${prop.name} = __$prop.name; + } + /* + * ${prop.xmlEncodedDescription} + * Raw ( bypadd bindings ) Getter for $prop.name + * @return $prop.name value from local variable + */ + public $prop.simpleClassName ${prop.getterName}Raw() + { + return this._${prop.name}; + } +#end +#end +#end + + +#if($validator.stateHolderRequired) + + // Save state + // ----------------------------------------------------- StateHolder Methods + + private boolean _transient; +#if(${validator.superclassImplementsStateHolder}) +#set($currentField=1) +#set( $fieldCounter = $fieldCounter+1) +#else +#set($currentField=0) +#end + public Object saveState(FacesContext context) { +#if(${validator.superSaveStateMethodExists}) + Object values[] = new Object[${fieldCounter}]; + values[0] = super.saveState(context); +#else + Object values[] = new Object[${fieldCounter}]; +#end +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + values[${currentField}] = new ${prop.boxingClass}(_$prop.name); +#set( $currentField = $currentField+1) + values[${currentField}] = Boolean.valueOf(_${prop.name}Set); +#set( $currentField = $currentField+1) +#else +#if(!${prop.attachedstate} ) + values[${currentField}] = _$prop.name; +#else + values[${currentField}] = saveAttachedState(context, _$prop.name ); +#end +#set( $currentField = $currentField+1) +#end +#end +#end + return values; + } + +#if(${validator.superclassImplementsStateHolder}) +#set($currentField=1) +#else +#set($currentField=0) +#end + public void restoreState(FacesContext context, Object state) { +#if(${validator.superRestoreStateMethodExists}) + Object values[] = (Object[]) state; + super.restoreState(context, values[0]); +#else + Object values[] = (Object[]) state; +#end +#foreach( $prop in $validator.properties ) +#if( !$prop.exist ) +#if($prop.simpleType) + _$prop.name = ((${prop.boxingClass})values[${currentField}]).${prop.classname}Value(); +#set( $currentField = $currentField+1) + _${prop.name}Set = ((Boolean)values[${currentField}]).booleanValue(); +#set( $currentField = $currentField+1) +#else +#if( !${prop.attachedstate} ) + _$prop.name = (${prop.simpleClassName})values[${currentField}] ; +#else + _$prop.name = (${prop.simpleClassName})restoreAttachedState(context,values[${currentField}] ); +#end +#set( $currentField = $currentField+1) +#end + +#end +#end + } + +#if(!$validator.superIsTransientMethodExists) + public boolean isTransient() + { + return _transient; + } +#end + +#if(!$validator.superSetTransientMethodExists) + public void setTransient(boolean newTransientValue) + { + this._transient = newTransientValue; + } +#end + +#end + + +// Utilites + + private FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } + + private ValueBinding getValueBinding(String name) + { + return getFacesContext().getApplication().createValueBinding(name); + } + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/META-INF/templates12/validatorTag.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,93 @@ +/** + * GENERATED FILE - DO NOT EDIT + * + */ +package ${tag.packageName}; + +#foreach($import in $imports) +import $import ; +#end +import javax.faces.component.UIComponent; +import javax.faces.webapp.UIComponentTag; +import javax.faces.validator.Validator; +import org.apache.commons.beanutils.ConvertUtils; +import javax.faces.context.FacesContext; +import javax.servlet.jsp.JspException; +import javax.faces.el.ValueBinding; +import ${validator.classname}; + +public class $tag.simpleClassName extends $tag.superclass { + +// Fields +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + /* + * $prop.name + * ${prop.xmlEncodedDescription} + */ + private String _$prop.name = null; + +#end +#end +// Setters +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + /* + * $prop.description + * Setter for $prop.name + * @param $prop.name - new value + */ + public void ${prop.setterName}( String __${prop.name} ) + { + this._${prop.name} = __${prop.name}; + } + +#end +#if( $prop.alias) + /* + * ${prop.xmlEncodedDescription} + * Setter for alias of $prop.name as $prop.alias + * @param $prop.name - new value + */ + public void set${prop.upperFirstChar($prop.alias)}( String __${prop.alias} ) + { + this.${prop.setterName}(__${prop.alias}); + } +#end +#end + + protected Validator createValidator() throws JspException + { + ${validator.simpleClassName} validator = new ${validator.simpleClassName}(); + _setProperties(validator); + return validator; + } + + // Support method to wire in properties + private void _setProperties(${validator.simpleClassName} validator) throws JspException + { + FacesContext facesContext = FacesContext.getCurrentInstance(); +#foreach( $prop in $validator.properties ) +#if( !$prop.existintag ) + if (_${prop.name} != null) + { +#if( ${prop.el} ) + if (UIComponentTag.isValueReference(_${prop.name})) + { + ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name}); + validator.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext)); + } +#if (!${prop.elonly}) + else + { + validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); + } +#end + } +#else + validator.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class)); +#end +#end +#end + } +} Added: branches/refactor1/cdk/generator/target/classes/VM_global_library.vm =================================================================== --- branches/refactor1/cdk/generator/target/classes/VM_global_library.vm (rev 0) +++ branches/refactor1/cdk/generator/target/classes/VM_global_library.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,6 @@ +#macro( quietnull $a) +#if($a)$a#end +#end + + + Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/AntLogger.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/JSFGeneratorTask.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/VCPVersionTask.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties =================================================================== --- branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties (rev 0) +++ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/ant/velocity.properties 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,3 @@ +resource.loader classpath,antfile +classpath.resource.loader.class org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader +antfile.resource.loader.class org.ajax4jsf.builder.velocity.AntFileResourceLoader Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig$1.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/BuilderConfig.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBaseBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ComponentBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ConverterBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/EventBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/JsfBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ListenerBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/LoaderHolder.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ParsingException.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/PropertyBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/RendererBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TagHandlerBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/TestClassHolder.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/config/ValidatorBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder$1.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilder.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/BlankRendererGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet$PatternEntry.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ClassPatternSet.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTagGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ComponentTestGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ConverterTagGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FaceletsTaglibGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/FacesConfigGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GeneratorException.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/GetResourceInterceptor.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/InnerGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/JSFGeneratorConfiguration.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ListenerGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/Logger.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RenderKitBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererCompilationContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/RendererGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ResourcesConfigGeneratorBean.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagHandlerGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TagTestGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TaglibGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/TestDataGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/ValidatorTagGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/generator/XMLConfigGenerator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/AntFileResourceLoader.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/BuilderContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/velocity/ClasspathTemplateLoader.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/ArrayNodeList.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody$1.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/builder/xml/XMLBody.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties =================================================================== --- branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties (rev 0) +++ branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/ant/velocity.properties 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,3 @@ +resource.loader classpath,antfile +classpath.resource.loader.class org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader +antfile.resource.loader.class org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/CompilationException.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/StringUtils.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/builder/Variable.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL$containedClass.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/CompiledEL.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELCompiler.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ELParser.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/ICompiledEL.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/el/IELCompiler.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/Attribute.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/BodyElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/DeclarationElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsArray.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/ElementsFactory.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/RootElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/CommentElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/PIElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/TextElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Expression.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/CallbackListener.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/classes/org/ajax4jsf/templatecompiler/velocity/BuilderContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/generator-3.1.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.AppTest.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.ajax4jsf.AppTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/> + <property name="java.vm.version" value="1.6.0_01-b06"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=":"/> + <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="US"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="unknown"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.runtime.version" value="1.6.0_01-b06"/> + <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/> + <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/> + <property name="os.arch" value="i386"/> + <property name="java.io.tmpdir" value="/tmp"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="os.name" value="Linux"/> + <property name="sun.jnu.encoding" value="UTF-8"/> + <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Server Compiler"/> + <property name="os.version" value="2.6.21-1.3228.fc7"/> + <property name="user.home" value="/home/asmirnov"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> + <property name="file.encoding" value="UTF-8"/> + <property name="java.specification.version" value="1.6"/> + <property name="user.name" value="asmirnov"/> + <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="en"/> + <property name="java.vm.info" value="mixed mode"/> + <property name="java.version" value="1.6.0_01"/> + <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/> + <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="/home/asmirnov/.m2/repository"/> + <property name="file.separator" value="/"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="gnome"/> + <property name="sun.cpu.isalist" value=""/> + </properties> + <testcase time="0" name="testApp"/> +</testsuite> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.generator.ClassPatternSetTest.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.009" errors="0" skipped="0" tests="9" name="org.ajax4jsf.builder.generator.ClassPatternSetTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/> + <property name="java.vm.version" value="1.6.0_01-b06"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=":"/> + <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="US"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="unknown"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.runtime.version" value="1.6.0_01-b06"/> + <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/> + <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/> + <property name="os.arch" value="i386"/> + <property name="java.io.tmpdir" value="/tmp"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="os.name" value="Linux"/> + <property name="sun.jnu.encoding" value="UTF-8"/> + <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Server Compiler"/> + <property name="os.version" value="2.6.21-1.3228.fc7"/> + <property name="user.home" value="/home/asmirnov"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> + <property name="file.encoding" value="UTF-8"/> + <property name="java.specification.version" value="1.6"/> + <property name="user.name" value="asmirnov"/> + <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="en"/> + <property name="java.vm.info" value="mixed mode"/> + <property name="java.version" value="1.6.0_01"/> + <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/> + <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="/home/asmirnov/.m2/repository"/> + <property name="file.separator" value="/"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="gnome"/> + <property name="sun.cpu.isalist" value=""/> + </properties> + <testcase time="0.003" name="testSetExcludes"/> + <testcase time="0" name="testSetExcludes1"/> + <testcase time="0" name="testSetIncludes"/> + <testcase time="0" name="testMatchClassExclude"/> + <testcase time="0" name="testMatchClassInclude"/> + <testcase time="0.001" name="testMatchClassIncExclude"/> + <testcase time="0" name="testMatchPath"/> + <testcase time="0" name="testMatch"/> + <testcase time="0" name="testTokenizePathAsArray"/> +</testsuite> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/TEST-org.ajax4jsf.builder.xml.XMLBodyTest.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite failures="0" time="0.322" errors="0" skipped="0" tests="7" name="org.ajax4jsf.builder.xml.XMLBodyTest"> + <properties> + <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> + <property name="sun.boot.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386"/> + <property name="java.vm.version" value="1.6.0_01-b06"/> + <property name="java.vm.vendor" value="Sun Microsystems Inc."/> + <property name="java.vendor.url" value="http://java.sun.com/"/> + <property name="path.separator" value=":"/> + <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/> + <property name="file.encoding.pkg" value="sun.io"/> + <property name="user.country" value="US"/> + <property name="sun.java.launcher" value="SUN_STANDARD"/> + <property name="sun.os.patch.level" value="unknown"/> + <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> + <property name="user.dir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.runtime.version" value="1.6.0_01-b06"/> + <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/> + <property name="basedir" value="/home/asmirnov/work/refactor/richfaces/cdk/generator"/> + <property name="java.endorsed.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/endorsed"/> + <property name="os.arch" value="i386"/> + <property name="java.io.tmpdir" value="/tmp"/> + <property name="line.separator" value=" +"/> + <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/> + <property name="os.name" value="Linux"/> + <property name="sun.jnu.encoding" value="UTF-8"/> + <property name="java.library.path" value="/usr/local/jdk1.6.0_01/jre/lib/i386/server:/usr/local/jdk1.6.0_01/jre/lib/i386:/usr/local/jdk1.6.0_01/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/> + <property name="java.specification.name" value="Java Platform API Specification"/> + <property name="java.class.version" value="50.0"/> + <property name="sun.management.compiler" value="HotSpot Server Compiler"/> + <property name="os.version" value="2.6.21-1.3228.fc7"/> + <property name="user.home" value="/home/asmirnov"/> + <property name="user.timezone" value=""/> + <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> + <property name="file.encoding" value="UTF-8"/> + <property name="java.specification.version" value="1.6"/> + <property name="user.name" value="asmirnov"/> + <property name="java.class.path" value="/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-api/2.3/surefire-api-2.3.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar:/home/asmirnov/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar:/home/asmirnov/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar:/home/asmirnov/.m2/repository/org/apache/maven/surefire/surefire-booter/2.3/surefire-booter-2.3.jar:/home/asmirnov/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar:/home/asmirnov/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar"/> + <property name="java.vm.specification.version" value="1.0"/> + <property name="sun.arch.data.model" value="32"/> + <property name="java.home" value="/usr/local/jdk1.6.0_01/jre"/> + <property name="java.specification.vendor" value="Sun Microsystems Inc."/> + <property name="user.language" value="en"/> + <property name="java.vm.info" value="mixed mode"/> + <property name="java.version" value="1.6.0_01"/> + <property name="java.ext.dirs" value="/usr/local/jdk1.6.0_01/jre/lib/ext:/usr/java/packages/lib/ext"/> + <property name="sun.boot.class.path" value="/usr/local/jdk1.6.0_01/jre/lib/resources.jar:/usr/local/jdk1.6.0_01/jre/lib/rt.jar:/usr/local/jdk1.6.0_01/jre/lib/sunrsasign.jar:/usr/local/jdk1.6.0_01/jre/lib/jsse.jar:/usr/local/jdk1.6.0_01/jre/lib/jce.jar:/usr/local/jdk1.6.0_01/jre/lib/charsets.jar:/usr/local/jdk1.6.0_01/jre/classes"/> + <property name="java.vendor" value="Sun Microsystems Inc."/> + <property name="localRepository" value="/home/asmirnov/.m2/repository"/> + <property name="file.separator" value="/"/> + <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/> + <property name="sun.cpu.endian" value="little"/> + <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> + <property name="sun.desktop" value="gnome"/> + <property name="sun.cpu.isalist" value=""/> + </properties> + <testcase time="0.072" name="testLoadXML"/> + <testcase time="0.002" name="testIsRootName"/> + <testcase time="0.002" name="testGetDoctype"/> + <testcase time="0.003" name="testGetRootNameSpace"/> + <testcase time="0.079" name="testGetContent"/> + <testcase time="0.109" name="testGetContentXpath"/> + <testcase time="0.01" name="testGetContentUnique"/> +</testsuite> \ No newline at end of file Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.AppTest.txt 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.ajax4jsf.AppTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.generator.ClassPatternSetTest.txt 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.ajax4jsf.builder.generator.ClassPatternSetTest +------------------------------------------------------------------------------- +Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec Added: branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt =================================================================== --- branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt (rev 0) +++ branches/refactor1/cdk/generator/target/surefire-reports/org.ajax4jsf.builder.xml.XMLBodyTest.txt 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: org.ajax4jsf.builder.xml.XMLBodyTest +------------------------------------------------------------------------------- +Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.332 sec Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/AppTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClass.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest$Proxy.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/AbstractClassStubBuilderTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseClass.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/BaseInterface.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/generator/ClassPatternSetTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/org/ajax4jsf/builder/xml/XMLBodyTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/target/test-classes/test/TestComponent.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/maven-archetype-jsf-component/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,11 +1,11 @@ <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>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -7,7 +7,7 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <version>1.1.1-SNAPSHOT</version> <configuration> Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/META-INF/maven/archetype.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,18 @@ +<archetype> + <id>maven-archetype-jsf-component</id> + <sources> + <source>src/main/java/component/README</source> + </sources> + <testSources> + <source>src/test/java/component/JSFComponentTest.java</source> + </testSources> + <resources> + <resource>src/main/config/component/README</resource> + <resource>src/main/templates/README</resource> + </resources> +</archetype> Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,32 @@ +<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>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <name>${artifactId}</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>1.1.1-SNAPSHOT</version> + <configuration> + <library> + <prefix>${groupId}</prefix> + <taglib> + <shortName>${artifactId}</shortName> + </taglib> + </library> + </configuration> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/README =================================================================== Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/config/component/_compName.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > + +<components> + <component> + <name>${groupId}.${artifactId}</name> + <family>${groupId}.${artifactId}</family> + <classname>${groupId}.component.html.Html${artifactId}</classname> + <superclass>${groupId}.component.UI${artifactId}</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>${groupId}.${artifactId}Renderer</name> + <template>${artifactId}.jspx</template> + </renderer> + <tag> + <name>${artifactId}</name> + <classname>${groupId}.taglib.${artifactId}Tag</classname> + <superclass> + org.ajax4jsf.framework.taglib.HtmlComponentTagBase + </superclass> + </tag> +  + &ui_component_attributes; +  + </component> +</components> Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/README =================================================================== Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/java/component/_CompName.java 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,32 @@ +/** + * 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 ${groupId}.component; + +import javax.faces.component.UIComponentBase; + +/** + * JSF component class + * + */ +public abstract class UI${artifactId} extends UIComponentBase +{ +} Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/README =================================================================== Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/main/templates/_compName.jspx 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + class="${groupId}.renderkit.html.${artifactId}Renderer" + baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase" + component="${groupId}.component.UI${artifactId}" + > + <f:clientid var="clientId"/> + <div id="#{clientId}" + x:passThruWithExclusions="value,name,type,id" + > + </div> +</f:root> \ No newline at end of file Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java =================================================================== --- branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsf-component/target/classes/archetype-resources/src/test/java/component/JSFComponentTest.java 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,53 @@ +/** + * 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 ${groupId}.component; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; +import javax.faces.component.UIComponent; + +/** + * Unit test for simple Component. + */ +public class JSFComponentTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public JSFComponentTest( String testName ) + { + super( testName ); + } + + + /** + * Rigourous Test :-) + */ + public void testComponent() + { + assertTrue( true ); + } +} Added: branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-archetype-jsf-component/target/maven-archetype-jsf-component-3.1.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,11 +1,11 @@ <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>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/META-INF/maven/archetype.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,16 @@ +<archetype> + <id>maven-archetype-jsfwebapp</id> + <sources> + <source>src/main/java/Bean.java</source> + </sources> + <testSources> + <source>src/test/java/BeanTest.java</source> + </testSources> + <resources> + <resource>src/main/webapp/index.jsp</resource> + <resource>src/main/webapp/pages/index.jsp</resource> + <resource>src/main/webapp/pages/index.xhtml</resource> + <resource>src/main/webapp/WEB-INF/web.xml</resource> + <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> + </resources> +</archetype> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,31 @@ +<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>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <packaging>war</packaging> + <name>${artifactId} Maven Webapp</name> + <build> + <finalName>${artifactId}</finalName> + </build> + + <dependencies> +#if(${facelets}) + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> +#end + </dependencies> +</project> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/java/Bean.java 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,29 @@ +/** + * 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 ${package}; +/** + * @author $Autor$ + * + */ +public class Bean { + +} \ No newline at end of file Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/META-INF/MANIFEST.MF 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 + +Class-Path: + + + Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>bean</managed-bean-name> + <managed-bean-class>${package}.Bean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> +</faces-config> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS ENTITY="JSFProcess"/> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/WEB-INF/web.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>Archetype Created Web Application</display-name> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> +  + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</param-value> + </context-param> +  + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/index.jsp 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,11 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + +<head></head> + + <body> + <jsp:forward page="/pages/index.jsf" /> + </body> + +</html> \ No newline at end of file Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.jsp 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + + </f:view> + </body> +</html> Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/main/webapp/pages/index.xhtml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:c="http://java.sun.com/jsp/jstl/core" + > + <f:view> + + </f:view> +</html> \ No newline at end of file Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java =================================================================== --- branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java (rev 0) +++ branches/refactor1/cdk/maven-archetype-jsfwebapp/target/classes/archetype-resources/src/test/java/BeanTest.java 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,46 @@ +/** + * 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 ${package}; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** +*/ +public class BeanTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public BeanTest( String testName ) + { + super( testName ); + } + + public void testStub() throws Exception { + + } +} Added: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-archetype-jsfwebapp/target/maven-archetype-jsfwebapp-3.1.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/refactor1/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/maven-cdk-plugin/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,15 +1,14 @@ <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>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url> <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -48,7 +47,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> <version>${project.version}</version> </dependency> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/META-INF/maven/plugin.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,899 @@ +<plugin> + <description></description> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <goalPrefix>cdk</goalPrefix> + <isolatedRealm>false</isolatedRealm> + <inheritedByDefault>true</inheritedByDefault> + <mojos> + <mojo> + <goal>generate-tests</goal> + <description></description> + <requiresDependencyResolution>test</requiresDependencyResolution> + <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresProject>true</requiresProject> + <requiresReports>false</requiresReports> + <aggregator>false</aggregator> + <requiresOnline>false</requiresOnline> + <inheritedByDefault>true</inheritedByDefault> + <phase>generate-test-sources</phase> + <executePhase>test-compile</executePhase> + <implementation>org.ajax4jsf.builder.mojo.GenerateTestMojo</implementation> + <language>java</language> + <instantiationStrategy>per-lookup</instantiationStrategy> + <executionStrategy>once-per-session</executionStrategy> + <parameters> + <parameter> + <name>classpathElements</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Project classpath.</description> + </parameter> + <parameter> + <name>compileSourceRoots</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The source directories containing the sources to be compiled.</description> + </parameter> + <parameter> + <name>componentConfigDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files. All '*.xml' files wil be +parsed as components config. All '*.ent' files will be processed as +include configurations.</description> + </parameter> + <parameter> + <name>executedProject</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Project executed by first compile lifecycle.</description> + </parameter> + <parameter> + <name>facesConfigInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for faces configuration XML files</description> + </parameter> + <parameter> + <name>key</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>library</name> + <type>org.ajax4jsf.builder.mojo.Library</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>outputDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputJavaDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputResourcesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputTestsDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>project</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Top maven project.</description> + </parameter> + <parameter> + <name>resourcesInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>taglibInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>templatesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + </parameters> + <configuration> + <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude> + <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory> + <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory> + <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject> + <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory> + <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory> + <project implementation="org.apache.maven.project.MavenProject">${project}</project> + <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude> + <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory> + <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory> + <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements> + <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude> + <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots> + </configuration> + <requirements> + <requirement> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <field-name>velocity</field-name> + </requirement> + </requirements> + </mojo> + <mojo> + <goal>generate</goal> + <description>This plugin geterate JSF components and renderers source code, as well as +configuration files.</description> + <requiresDependencyResolution>compile</requiresDependencyResolution> + <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresProject>true</requiresProject> + <requiresReports>false</requiresReports> + <aggregator>false</aggregator> + <requiresOnline>false</requiresOnline> + <inheritedByDefault>true</inheritedByDefault> + <phase>generate-sources</phase> + <executePhase>compile</executePhase> + <implementation>org.ajax4jsf.builder.mojo.GenerateMojo</implementation> + <language>java</language> + <instantiationStrategy>per-lookup</instantiationStrategy> + <executionStrategy>once-per-session</executionStrategy> + <parameters> + <parameter> + <name>classpathElements</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Project classpath.</description> + </parameter> + <parameter> + <name>compileSourceRoots</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The source directories containing the sources to be compiled.</description> + </parameter> + <parameter> + <name>componentConfigDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files. All '*.xml' files wil be +parsed as components config. All '*.ent' files will be processed as +include configurations.</description> + </parameter> + <parameter> + <name>executedProject</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Project executed by first compile lifecycle.</description> + </parameter> + <parameter> + <name>facesConfigInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for faces configuration XML files</description> + </parameter> + <parameter> + <name>key</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>library</name> + <type>org.ajax4jsf.builder.mojo.Library</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>outputDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputJavaDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputResourcesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputTestsDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>project</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Top maven project.</description> + </parameter> + <parameter> + <name>resourcesInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>taglibInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>templatesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + </parameters> + <configuration> + <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude> + <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory> + <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory> + <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject> + <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory> + <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory> + <project implementation="org.apache.maven.project.MavenProject">${project}</project> + <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude> + <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory> + <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory> + <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements> + <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude> + <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots> + </configuration> + <requirements> + <requirement> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <field-name>velocity</field-name> + </requirement> + </requirements> + </mojo> + <mojo> + <goal>compile</goal> + <description>Compile all xml templates, matched given pattern to Java classes. Sources +will be created in {@link AbstractCDKMojo#outputJavaDirectory}</description> + <requiresDependencyResolution>compile</requiresDependencyResolution> + <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresProject>true</requiresProject> + <requiresReports>false</requiresReports> + <aggregator>false</aggregator> + <requiresOnline>false</requiresOnline> + <inheritedByDefault>true</inheritedByDefault> + <phase>generate-sources</phase> + <implementation>org.ajax4jsf.builder.mojo.CompileMojo</implementation> + <language>java</language> + <instantiationStrategy>per-lookup</instantiationStrategy> + <executionStrategy>once-per-session</executionStrategy> + <parameters> + <parameter> + <name>classpathElements</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Project classpath.</description> + </parameter> + <parameter> + <name>compileSourceRoots</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The source directories containing the sources to be compiled.</description> + </parameter> + <parameter> + <name>componentConfigDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files. All '*.xml' files wil be +parsed as components config. All '*.ent' files will be processed as +include configurations.</description> + </parameter> + <parameter> + <name>defaultPackage</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>excludes</name> + <type>java.lang.String[]</type> + <required>false</required> + <editable>true</editable> + <description>A list of exclusion filters for the compiler. None by default.</description> + </parameter> + <parameter> + <name>executedProject</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Project executed by first compile lifecycle.</description> + </parameter> + <parameter> + <name>facesConfigInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for faces configuration XML files</description> + </parameter> + <parameter> + <name>includes</name> + <type>java.lang.String[]</type> + <required>false</required> + <editable>true</editable> + <description>A list of inclusion filters for the compiler. By default, include all +files in templates directory.</description> + </parameter> + <parameter> + <name>key</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>library</name> + <type>org.ajax4jsf.builder.mojo.Library</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>localRepository</name> + <type>org.apache.maven.artifact.repository.ArtifactRepository</type> + <required>false</required> + <editable>true</editable> + <description>The local repository.</description> + </parameter> + <parameter> + <name>outputDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputJavaDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputResourcesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputTestsDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>parentProject</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>The reactor projects.</description> + </parameter> + <parameter> + <name>project</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Top maven project.</description> + </parameter> + <parameter> + <name>resourcesInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>taglibInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>templatesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + </parameters> + <configuration> + <parentProject implementation="org.apache.maven.project.MavenProject">${project.parent}</parentProject> + <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude> + <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory> + <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory> + <executedProject implementation="org.apache.maven.project.MavenProject">${executedProject}</executedProject> + <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory> + <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory> + <project implementation="org.apache.maven.project.MavenProject">${project}</project> + <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude> + <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory> + <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory> + <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements> + <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude> + <localRepository implementation="org.apache.maven.artifact.repository.ArtifactRepository">${localRepository}</localRepository> + <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots> + </configuration> + <requirements> + <requirement> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <field-name>velocity</field-name> + </requirement> + <requirement> + <role>org.apache.maven.project.MavenProjectBuilder</role> + <field-name>mavenProjectBuilder</field-name> + </requirement> + <requirement> + <role>org.codehaus.plexus.archiver.manager.ArchiverManager</role> + <field-name>archiverManager</field-name> + </requirement> + </requirements> + </mojo> + <mojo> + <goal>assembly</goal> + <description>This plugin assembly full components library from modules, included in parent +project. Steps to create library : 1. Got parent project, and check modules +included in them. 2. For every module , build project and got it properties. +3. Resolve module artifact, check for "jar" type and include/exclude +criteria. for accepted modules, unpack it to classes directory, and put +config files in separate directories. 4. Append unpacked directory to +resources, included in result jar. 5. Merge all META-INF/faces-config.xml , +*.tld, *.taglib.xml , resources-config.xml into ones. 6. append dependencies +of included projects to this.</description> + <requiresDependencyResolution>compile</requiresDependencyResolution> + <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresProject>true</requiresProject> + <requiresReports>false</requiresReports> + <aggregator>false</aggregator> + <requiresOnline>false</requiresOnline> + <inheritedByDefault>true</inheritedByDefault> + <phase>generate-resources</phase> + <implementation>org.ajax4jsf.builder.mojo.AssemblyLibraryMojo</implementation> + <language>java</language> + <instantiationStrategy>per-lookup</instantiationStrategy> + <executionStrategy>once-per-session</executionStrategy> + <parameters> + <parameter> + <name>buildDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>classpathElements</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Project classpath.</description> + </parameter> + <parameter> + <name>compileSourceRoots</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The source directories containing the sources to be compiled.</description> + </parameter> + <parameter> + <name>componentConfigDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files. All '*.xml' files wil be +parsed as components config. All '*.ent' files will be processed as +include configurations.</description> + </parameter> + <parameter> + <name>facesConfigInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for faces configuration XML files</description> + </parameter> + <parameter> + <name>generatedPom</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>includeTaglib</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>includeTld</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>key</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>library</name> + <type>org.ajax4jsf.builder.mojo.Library</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>localRepository</name> + <type>org.apache.maven.artifact.repository.ArtifactRepository</type> + <required>false</required> + <editable>true</editable> + <description>The local repository.</description> + </parameter> + <parameter> + <name>modulesSrc</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputJavaDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputResourcesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputTestsDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>parentProject</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>The reactor projects.</description> + </parameter> + <parameter> + <name>project</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Top maven project.</description> + </parameter> + <parameter> + <name>reactorProjects</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The reactor projects.</description> + </parameter> + <parameter> + <name>resourcesInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>taglibInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>templates</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>templatesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + </parameters> + <configuration> + <parentProject implementation="org.apache.maven.project.MavenProject">${project.parent}</parentProject> + <buildDirectory implementation="java.io.File">${project.build.directory}</buildDirectory> + <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude> + <modulesSrc implementation="java.io.File">${project.build.directory}/src</modulesSrc> + <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory> + <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory> + <reactorProjects implementation="java.util.List">${reactorProjects}</reactorProjects> + <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory> + <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory> + <project implementation="org.apache.maven.project.MavenProject">${project}</project> + <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude> + <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory> + <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory> + <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements> + <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude> + <localRepository implementation="org.apache.maven.artifact.repository.ArtifactRepository">${localRepository}</localRepository> + <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots> + <generatedPom implementation="java.io.File">${project.build.directory}/pom.xml</generatedPom> + </configuration> + <requirements> + <requirement> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <field-name>velocity</field-name> + </requirement> + <requirement> + <role>org.apache.maven.artifact.resolver.ArtifactResolver</role> + <field-name>resolver</field-name> + </requirement> + <requirement> + <role>org.apache.maven.artifact.factory.ArtifactFactory</role> + <field-name>factory</field-name> + </requirement> + <requirement> + <role>org.apache.maven.project.MavenProjectBuilder</role> + <field-name>mavenProjectBuilder</field-name> + </requirement> + <requirement> + <role>org.codehaus.plexus.archiver.manager.ArchiverManager</role> + <field-name>archiverManager</field-name> + </requirement> + </requirements> + </mojo> + <mojo> + <goal>create</goal> + <description></description> + <requiresDirectInvocation>false</requiresDirectInvocation> + <requiresProject>true</requiresProject> + <requiresReports>false</requiresReports> + <aggregator>false</aggregator> + <requiresOnline>false</requiresOnline> + <inheritedByDefault>true</inheritedByDefault> + <implementation>org.ajax4jsf.builder.mojo.CreateComponentMojo</implementation> + <language>java</language> + <instantiationStrategy>per-lookup</instantiationStrategy> + <executionStrategy>once-per-session</executionStrategy> + <parameters> + <parameter> + <name>baseClass</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>classpathElements</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Project classpath.</description> + </parameter> + <parameter> + <name>compileSourceRoots</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>The source directories containing the sources to be compiled.</description> + </parameter> + <parameter> + <name>componentConfigDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files. All '*.xml' files wil be +parsed as components config. All '*.ent' files will be processed as +include configurations.</description> + </parameter> + <parameter> + <name>facesConfigInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for faces configuration XML files</description> + </parameter> + <parameter> + <name>key</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>library</name> + <type>org.ajax4jsf.builder.mojo.Library</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>markup</name> + <type>java.lang.String</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>name</name> + <type>java.lang.String</type> + <required>true</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>outputDirectory</name> + <type>java.io.File</type> + <required>true</required> + <editable>false</editable> + <description>The directory for compiled classes.</description> + </parameter> + <parameter> + <name>outputJavaDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputResourcesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>outputTestsDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + <parameter> + <name>plugins</name> + <type>java.util.List</type> + <required>true</required> + <editable>false</editable> + <description>Directory where the output Java Files will be located.</description> + </parameter> + <parameter> + <name>project</name> + <type>org.apache.maven.project.MavenProject</type> + <required>false</required> + <editable>false</editable> + <description>Top maven project.</description> + </parameter> + <parameter> + <name>resourcesInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>taglibInclude</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description>Place for component configuration XML files</description> + </parameter> + <parameter> + <name>templatesDirectory</name> + <type>java.io.File</type> + <required>false</required> + <editable>true</editable> + <description></description> + </parameter> + </parameters> + <configuration> + <markup implementation="java.lang.String">${markup}</markup> + <plugins implementation="java.util.List">${project.build.plugins}</plugins> + <taglibInclude implementation="java.io.File">src/main/config/taglib</taglibInclude> + <outputTestsDirectory implementation="java.io.File">${project.build.directory}/generated-component/test</outputTestsDirectory> + <outputDirectory implementation="java.io.File">${project.build.outputDirectory}</outputDirectory> + <componentConfigDirectory implementation="java.io.File">src/main/config/component</componentConfigDirectory> + <templatesDirectory implementation="java.io.File">src/main/templates</templatesDirectory> + <baseClass implementation="java.lang.String" default-value="javax.faces.component.UIComponentBase">${baseClass}</baseClass> + <project implementation="org.apache.maven.project.MavenProject">${project}</project> + <resourcesInclude implementation="java.io.File">src/main/config/resources</resourcesInclude> + <name implementation="java.lang.String">${name}</name> + <outputJavaDirectory implementation="java.io.File">${project.build.directory}/generated-component/java</outputJavaDirectory> + <outputResourcesDirectory implementation="java.io.File">${project.build.directory}/generated-component/resources</outputResourcesDirectory> + <classpathElements implementation="java.util.List">${project.compileClasspathElements}</classpathElements> + <facesConfigInclude implementation="java.io.File">src/main/config/faces</facesConfigInclude> + <compileSourceRoots implementation="java.util.List">${project.compileSourceRoots}</compileSourceRoots> + </configuration> + <requirements> + <requirement> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <field-name>velocity</field-name> + </requirement> + </requirements> + </mojo> + </mojos> + <dependencies/> +</plugin> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/VM_global_library.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,6 @@ +#macro( quietnull $a) +#if($a)$a#end +#end + + + Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/UIClass.java 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,19 @@ +/** + * + */ + +package ${package}.component; + +import ${baseClass}; + +/** + * JSF component class + * + */ +public abstract class UI${className} extends ${baseClassName} { + + private static final String COMPONENT_TYPE = "${prefix}.${className}"; + + private static final String COMPONENT_FAMILY = "${prefix}.${className}"; + +} Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/config.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > +<components> + <component> + <name>${prefix}.${className}</name> + <family>${prefix}.${className}</family> + <classname>${package}.component.${markup}.${markupName}${className}</classname> + <superclass>${package}.component.UI${className}</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>${prefix}.${className}Renderer</name> + <template>${path}/${markup}${className}.jspx</template> + </renderer> + <tag> + <name>${name}</name> + <classname>${package}.taglib.${className}Tag</classname> + <superclass> + org.ajax4jsf.framework.taglib.HtmlComponentTagBase + </superclass> + </tag> +  + &ui_component_attributes; +  + </component> +</components> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/component/template.jspx 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + class="${package}.renderkit.${markup}.${className}Renderer" + baseclass="org.ajax4jsf.framework.renderer.AjaxComponentRendererBase" + component="${package}.component.UI${className}" + > + <f:clientid var="clientId"/> + <div id="#{clientId}" + x:passThruWithExclusions="value,name,type,id" + > + </div> +</f:root> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenCompilationContext.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/maven/MavenLogger.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AbstractCDKMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CompileMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/CreateComponentMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$1.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo$2.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/GenerateTestMojo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Library.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Renderkit.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/classes/org/ajax4jsf/builder/mojo/Taglib.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/faces-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> +${content} + +#foreach( $kit in ${renderkits}) + <render-kit> + #if(${kit.name}) + <render-kit-id>${kit.name}</render-kit-id> + #if(${kit.classname}) + <render-kit-class>${kit.classname}</render-kit-class> + #end + #end + ${kit.facesConfig} + </render-kit> +#end + + +</faces-config> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/resources-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> +${content} +</resource-config> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> +<namespace>${library.taglib.uri}</namespace> + +${content} +</facelet-taglib> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates/tld.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> +<taglib> + <tlib-version>${library.taglib.tlibVersion}</tlib-version> + <jsp-version>${library.taglib.jspVersion}</jsp-version> +#if(${library.taglib.shortName}) + <short-name>${library.taglib.shortName}</short-name> +#end + <uri>${library.taglib.uri}</uri> +#if(${library.taglib.displayName}) + <display-name>${library.taglib.displayName}</display-name> +#end +#if(${library.description}) + <description>${library.description}</description> +#end +#if(${library.taglib.validatorClass}) + <validator> + <validator-class>${library.taglib.validatorClass}</validator-class> + </validator> +#end + +${content} +</taglib> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/faces-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> + +${content} +#foreach( $kit in ${renderkits}) + <render-kit> + #if(${kit.name}) + <render-kit-id>${kit.name}</render-kit-id> + #if(${kit.classname}) + <render-kit-class>${kit.classname}</render-kit-class> + #end + #end + ${kit.facesConfig} + </render-kit> +#end + + +</faces-config> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/resources-config.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resource-config> +${content} +</resource-config> Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/taglib.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> +<namespace>${library.taglib.uri}</namespace> + +${content} +</facelet-taglib> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm =================================================================== --- branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm (rev 0) +++ branches/refactor1/cdk/maven-cdk-plugin/target/classes/templates12/tld.vm 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<taglib xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="${library.taglib.jspVersion}"> + +<tlib-version>${library.taglib.tlibVersion}</tlib-version> +#if(${library.taglib.shortName}) + <short-name>${library.taglib.shortName}</short-name> +#end + <uri>${library.taglib.uri}</uri> +#if(${library.taglib.displayName}) + <display-name>${library.taglib.displayName}</display-name> +#end +#if(${library.description}) + <description>${library.description}</description> +#end +#if(${library.taglib.validatorClass}) + <validator> + <validator-class>${library.taglib.validatorClass}</validator-class> + </validator> +#end + +${content} +</taglib> \ No newline at end of file Added: branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/maven-cdk-plugin/target/maven-cdk-plugin-3.1.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/refactor1/cdk/pom.xml =================================================================== --- branches/refactor1/cdk/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/cdk/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> <packaging>pom</packaging> <name>JSF Components Development kit</name> - <version>1.1.2-SNAPSHOT</version> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> <dependencies /> <build> <pluginManagement> @@ -30,7 +28,6 @@ </build> <modules> <module>maven-cdk-plugin</module> - <module>compiler</module> <module>generator</module> <module>maven-archetype-jsf-component</module> <module>maven-archetype-jsfwebapp</module> Modified: branches/refactor1/docs/ajaxguide/en/pom.xml =================================================================== --- branches/refactor1/docs/ajaxguide/en/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/ajaxguide/en/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.ajax4jsf.docs.userguide</groupId> + <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> <packaging>jar</packaging> <name>Ajax4jsf Manual (${translation})</name> @@ -28,7 +28,7 @@ </plugin> <plugin> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>maven-docbook-plugin</artifactId> </plugin> </plugins> Modified: branches/refactor1/docs/ajaxguide/pom.xml =================================================================== --- branches/refactor1/docs/ajaxguide/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/ajaxguide/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>docs</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>pom</packaging> <description>Ajax4jsf user guide</description> <pluginRepositories> @@ -44,7 +44,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId> ajax4jsf </artifactId> @@ -59,7 +59,7 @@ </artifactItem> <artifactItem> <groupId> - org.ajax4jsf.docs + org.richfaces.docs </groupId> <artifactId>xslt</artifactId> <version> @@ -145,7 +145,7 @@ </plugin> <plugin> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>maven-docbook-plugin</artifactId> <version>${project.version}</version> <executions> @@ -170,7 +170,7 @@ </executions> <dependencies> <dependency> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>xslt</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/docs/maven-docbook-plugin/pom.xml =================================================================== --- branches/refactor1/docs/maven-docbook-plugin/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/maven-docbook-plugin/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -7,11 +7,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>docs</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>maven-docbook-plugin</artifactId> <packaging>maven-plugin</packaging> @@ -23,7 +23,7 @@ <dependencies> <dependency> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>docbook</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/docs/pom.xml =================================================================== --- branches/refactor1/docs/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../richfaces/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/refactor1/docs/userguide/en/pom.xml =================================================================== --- branches/refactor1/docs/userguide/en/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/userguide/en/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -5,7 +5,7 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> @@ -28,7 +28,7 @@ </plugin> <plugin> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>maven-docbook-plugin</artifactId> </plugin> </plugins> Modified: branches/refactor1/docs/userguide/pom.xml =================================================================== --- branches/refactor1/docs/userguide/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/userguide/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -5,7 +5,7 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> @@ -80,11 +80,11 @@ </artifactItem> <artifactItem> <groupId> - org.ajax4jsf.docs + org.richfaces.docs </groupId> <artifactId>xslt</artifactId> <version> - 1.1.2-SNAPSHOT + 3.1.0-SNAPSHOT </version> <type>jar</type> <overWrite>true</overWrite> @@ -166,9 +166,9 @@ </plugin> <plugin> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>maven-docbook-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate</id> @@ -191,9 +191,9 @@ </executions> <dependencies> <dependency> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>xslt</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> <configuration> Modified: branches/refactor1/docs/xslt/pom.xml =================================================================== --- branches/refactor1/docs/xslt/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/docs/xslt/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,11 +2,11 @@ <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>docs</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.docs</groupId> + <groupId>org.richfaces.docs</groupId> <artifactId>xslt</artifactId> <description>Docbook documentation stylesheets</description> </project> Modified: branches/refactor1/extensions/gwt/pom.xml =================================================================== --- branches/refactor1/extensions/gwt/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/extensions/gwt/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,11 +2,11 @@ <project> <parent> <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>gwtjsf</artifactId> <name>Google web toolkit and JSF integration library</name> <url>https://ajax4jsf.dev.java.net</url> @@ -97,7 +97,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/extensions/portlet/pom.xml =================================================================== --- branches/refactor1/extensions/portlet/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/extensions/portlet/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,11 +1,11 @@ <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>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>a4j-portlet</artifactId> <name>ajax4jsf portlet brige</name> <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> @@ -53,14 +53,14 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>test</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Modified: branches/refactor1/extensions/seam/pom.xml =================================================================== --- branches/refactor1/extensions/seam/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/extensions/seam/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,11 +1,11 @@ <?xml version="1.0"?><project> <parent> <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>a4j-seam</artifactId> <name>ajax4jsf and JBOSS Seam compability library</name> <url>https://ajax4jsf.dev.java.net</url> @@ -33,7 +33,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/extensions/trinidad/pom.xml =================================================================== --- branches/refactor1/extensions/trinidad/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/extensions/trinidad/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,11 +1,11 @@ <?xml version="1.0"?><project> <parent> <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>a4j-trinidad</artifactId> <name>ajax4jsf and MyFaces Trinidad compability library</name> <url>https://ajax4jsf.dev.java.net</url> @@ -33,7 +33,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> <version>${project.version}</version> </dependency> Modified: branches/refactor1/framework/impl/pom.xml =================================================================== --- branches/refactor1/framework/impl/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/framework/impl/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,14 +1,13 @@ <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>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.2-SNAPSHOT</version> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <name>Java Server Faces AJAX framework</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <name>Java Server Faces AJAX framework implementation</name> <properties> <jsfVersion>1.1</jsfVersion> </properties> @@ -23,31 +22,6 @@ </resources> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.ajax4jsf</prefix> - <jsfVersion>${jsfVersion}</jsfVersion> - <taglib> - <uri> - https://ajax4jsf.dev.java.net/ajax - </uri> - <shortName>a4j</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -83,14 +57,6 @@ </plugin> </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - </plugin> - </plugins> - </reporting> <dependencies> <dependency> <groupId>junit</groupId> @@ -123,22 +89,6 @@ <optional>true</optional> </dependency> <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>0.9</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> @@ -308,33 +258,5 @@ </dependency> </dependencies> </profile> - <profile> - <id>assembly</id> - <build> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <taglib.src.dir> - ${project.build.directory}/generated-component/resources/META-INF - </taglib.src.dir> - <tldDocDir> - ${project.build.directory}/tlddoc - </tldDocDir> - </configuration> - - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>taglibdocjar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> \ No newline at end of file Added: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC + "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> + + +<faces-config> + <factory> + <render-kit-factory>org.ajax4jsf.framework.renderer.ChameleonRenderKitFactory</render-kit-factory> + <lifecycle-factory>org.ajax4jsf.framework.DebugLifecycleFactory</lifecycle-factory> + </factory> + <application> +  + <view-handler>org.ajax4jsf.framework.ajax.AjaxViewHandler</view-handler> + <state-manager>org.ajax4jsf.framework.ajax.AjaxStateManager</state-manager> + </application> + <lifecycle> + <phase-listener>org.ajax4jsf.framework.renderer.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.framework.ajax.InitPhaseListener</phase-listener> + </lifecycle> + <managed-bean> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.ajax4jsf.framework.skin.VersionBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.ajax4jsf.framework.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> +  + <component> + + <component-type>javax.faces.ViewRoot</component-type> + <component-class>org.ajax4jsf.framework.ajax.AjaxViewRoot</component-class> + + <component-extension> + <component-family>javax.faces.ViewRoot</component-family> + </component-extension> + + </component> + + <render-kit> + + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.framework.renderer.AjaxViewRootRenderer</renderer-class> + </renderer> +  + </render-kit> +</faces-config> Added: branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t =================================================================== --- branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t (rev 0) +++ branches/refactor1/framework/impl/src/main/resources/META-INF/original-faces-config.xml.l4t 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS ENTITY="JSFProcess"/> Added: branches/refactor1/framework/pom.xml =================================================================== --- branches/refactor1/framework/pom.xml (rev 0) +++ branches/refactor1/framework/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>cdk</artifactId> + <packaging>pom</packaging> + <name>Java Server Faces AJAX framework</name> + <dependencies /> + <build> + </build> + <modules> + <module>api</module> + <module>impl</module> + </modules> +</project> \ No newline at end of file Modified: branches/refactor1/pom.xml =================================================================== --- branches/refactor1/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,20 +1,23 @@ <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>master</artifactId> + <artifactId>root</artifactId> <packaging>pom</packaging> - <name>RichFaces Components Examples</name> - <version>3.0.2-SNAPSHOT</version> + <name>Jboss RichFaces project</name> + <version>3.1.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> <dependencies /> <modules> - <module>richfaces</module> + <module>cdk</module> + <module>framework</module> + <module>ui</module> + <module>ui/assembly</module> + <module>extensions</module> <module>docs</module> - <module>richfaces-samples</module> + <module>samples</module>  - <module>richfaces/assembly</module> </modules> <distributionManagement> <downloadUrl> @@ -41,7 +44,6 @@ <id>sandbox</id> <modules> <module>sandbox</module> - <module>sandbox-samples</module> </modules> </profile> </profiles> Modified: branches/refactor1/samples/ajaxPortlet/pom.xml =================================================================== --- branches/refactor1/samples/ajaxPortlet/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/ajaxPortlet/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -3,7 +3,7 @@ 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.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>portalAjaxSample</artifactId> <packaging>war</packaging> <version>0.0.1</version> @@ -20,7 +20,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>a4j-portlet</artifactId> <version>1.1.1-SNAPSHOT</version> <exclusions> Modified: branches/refactor1/samples/portal-echo/pom.xml =================================================================== --- branches/refactor1/samples/portal-echo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/portal-echo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -43,7 +43,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>a4j-portlet</artifactId> <version>1.1.1-SNAPSHOT</version> <exclusions> Modified: branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/dataFilterSliderDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/dataTableDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/datascroller-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/dragDropDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/dropdownmenu-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/gmap-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/inputNumberSliderDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/inputNumberSpinnerDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/modalpanel-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/panel-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/panelbar-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -4,7 +4,7 @@ <artifactId>richfaces-samples</artifactId> <packaging>pom</packaging> <name>RichFaces Components Examples</name> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces/samples</url> <properties>  @@ -59,9 +59,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> @@ -233,9 +233,9 @@ </build> <dependencies> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/richfaces-demo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/separator-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/simpleTogglePanel-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/skins/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/skins/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/skins/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/suggestionbox-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/tabPanelDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/togglePanel-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/toolBarDemo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml =================================================================== --- branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/samples/richfaces-samples/tree-demo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/sandbox/pom.xml =================================================================== --- branches/refactor1/sandbox/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -206,14 +206,14 @@ </exclusions> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>test</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> Modified: branches/refactor1/sandbox/samples/calendar-sample/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/calendar-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/calendar-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/sandbox/samples/panel2-sample/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/panel2-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/panel2-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -15,12 +15,12 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>panel2</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/panelmenu-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/sandbox/samples/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -58,9 +58,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> @@ -88,7 +88,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> </dependencies> @@ -212,9 +212,9 @@ </build> <dependencies> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/scrollable-grid-demo/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -23,7 +23,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> Modified: branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/sandbox/samples/tooltip-sample/pom.xml =================================================================== --- branches/refactor1/sandbox/samples/tooltip-sample/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/samples/tooltip-sample/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/sandbox/tooltip/pom.xml =================================================================== --- branches/refactor1/sandbox/tooltip/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/tooltip/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <?xml version="1.0"?><project> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,7 +11,7 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <version>1.1.1-SNAPSHOT</version> <executions> @@ -37,7 +37,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>common</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/sandbox/ui/calendar/pom.xml =================================================================== --- branches/refactor1/sandbox/ui/calendar/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/ui/calendar/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -12,9 +12,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>common</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/refactor1/sandbox/ui/panel2/pom.xml =================================================================== --- branches/refactor1/sandbox/ui/panel2/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/ui/panel2/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -12,9 +12,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>common</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: branches/refactor1/sandbox/ui/panelmenu/pom.xml =================================================================== --- branches/refactor1/sandbox/ui/panelmenu/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/ui/panelmenu/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>common</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: branches/refactor1/sandbox/ui/scrollable-grid/pom.xml =================================================================== --- branches/refactor1/sandbox/ui/scrollable-grid/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/ui/scrollable-grid/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -62,14 +62,14 @@ </build> <dependencies> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/sandbox/ui/simpleTogglePanel2/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <?xml version="1.0"?><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>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/assembly/pom.xml =================================================================== --- branches/refactor1/ui/assembly/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/assembly/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -12,9 +12,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <configuration> <library> <prefix>org.richfaces</prefix> Modified: branches/refactor1/ui/common/pom.xml =================================================================== --- branches/refactor1/ui/common/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/common/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: branches/refactor1/ui/dataFilterSlider/pom.xml =================================================================== --- branches/refactor1/ui/dataFilterSlider/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/dataFilterSlider/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -12,9 +12,9 @@ <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/dataTable/pom.xml =================================================================== --- branches/refactor1/ui/dataTable/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/dataTable/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/datascroller/pom.xml =================================================================== --- branches/refactor1/ui/datascroller/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/datascroller/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/drag-drop/pom.xml =================================================================== --- branches/refactor1/ui/drag-drop/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/drag-drop/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/dropdown-menu/pom.xml =================================================================== --- branches/refactor1/ui/dropdown-menu/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/dropdown-menu/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/gmap/pom.xml =================================================================== --- branches/refactor1/ui/gmap/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/gmap/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/inputnumber-slider/pom.xml =================================================================== --- branches/refactor1/ui/inputnumber-slider/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/inputnumber-slider/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/refactor1/ui/inputnumber-spinner/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/inputnumber-spinner/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/refactor1/ui/menu-components/pom.xml =================================================================== --- branches/refactor1/ui/menu-components/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/menu-components/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/modal-panel/pom.xml =================================================================== --- branches/refactor1/ui/modal-panel/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/modal-panel/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/paint2D/pom.xml =================================================================== --- branches/refactor1/ui/paint2D/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/paint2D/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/panel/pom.xml =================================================================== --- branches/refactor1/ui/panel/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/panel/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/refactor1/ui/panelbar/pom.xml =================================================================== --- branches/refactor1/ui/panelbar/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/panelbar/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/pom.xml =================================================================== --- branches/refactor1/ui/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,10 +1,10 @@ <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> + <artifactId>ui</artifactId> <packaging>pom</packaging> <name>RichFaces Components</name> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <url>http://richfaces.ajax4jsf.org</url> <properties> <maven.test.failure.ignore>true</maven.test.failure.ignore> @@ -231,14 +231,14 @@ <version>3.0</version> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces</groupId> <artifactId>test</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> Modified: branches/refactor1/ui/separator/pom.xml =================================================================== --- branches/refactor1/ui/separator/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/separator/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <id>generate-sources</id> Modified: branches/refactor1/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/spacer/pom.xml =================================================================== --- branches/refactor1/ui/spacer/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/spacer/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/suggestionbox/pom.xml =================================================================== --- branches/refactor1/ui/suggestionbox/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/suggestionbox/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/tabPanel/pom.xml =================================================================== --- branches/refactor1/ui/tabPanel/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/tabPanel/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/togglePanel/pom.xml =================================================================== --- branches/refactor1/ui/togglePanel/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/togglePanel/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/toolBar/pom.xml =================================================================== --- branches/refactor1/ui/toolBar/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/toolBar/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> Modified: branches/refactor1/ui/tree/pom.xml =================================================================== --- branches/refactor1/ui/tree/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) +++ branches/refactor1/ui/tree/pom.xml 2007-06-28 21:15:47 UTC (rev 1391) @@ -1,8 +1,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>richfaces-parent</artifactId> + <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.0.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -11,9 +11,9 @@ <build> <plugins> <plugin> - <groupId>org.ajax4jsf.cdk</groupId> + <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1390 - in branches/refactor1/cdk: generator/src/main/java and 21 other directories.

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

Author: alexsmirnov Date: 2007-06-28 16:26:00 -0400 (Thu, 28 Jun 2007) New Revision: 1390 Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationContext.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationException.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/StringUtils.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/Variable.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/CompiledEL.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELParser.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ICompiledEL.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/IELCompiler.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/Attribute.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/BodyElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/DeclarationElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsArray.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsFactory.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/RootElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CommentElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/PIElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/TextElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Expression.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.java branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/BuilderContext.java branches/refactor1/cdk/generator/src/main/java/readme.txt branches/refactor1/cdk/generator/src/main/resources/META-INF/plexus/ branches/refactor1/cdk/generator/src/main/resources/META-INF/plexus/components.xml branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/VM_global_library.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeBegin.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeChildren.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeEnd.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_1.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/HTMLElement.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/IFElement.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/headerResource.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertCall.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertChildren.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertComponent.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertFacet.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertResource.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/set.vm branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/tags.bin branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/velocity.properties branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/ branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties branches/refactor1/cdk/generator/src/test/java/org/ajax4jsf/AppTest.java branches/refactor1/cdk/pom.xml Log: projects refactored Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/AntCompilationContext.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,114 @@ +/** + * 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.templatecompiler.ant; + +import org.ajax4jsf.templatecompiler.builder.AbstractCompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.apache.tools.ant.Project; +import org.apache.velocity.Template; + +/** + * @author shura + * + */ +public class AntCompilationContext extends AbstractCompilationContext { + + + private Project project; + + TemplateCompilerTask task; + + + + /** + * @param loader + * @throws CompilationException + */ + public AntCompilationContext(TemplateCompilerTask task, ClassLoader loader) throws CompilationException { + super(loader); + this.task = task; + this.project = task.getProject(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#debug(java.lang.String) + */ + public void debug(String content) { + project.log(content, Project.MSG_DEBUG); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#debug(java.lang.String, java.lang.Throwable) + */ + public void debug(String content, Throwable error) { + project.log(content, Project.MSG_DEBUG); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#error(java.lang.String) + */ + public void error(String content) { + project.log(content, Project.MSG_ERR); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#error(java.lang.String, java.lang.Throwable) + */ + public void error(String content, Throwable error) { + project.log(content, Project.MSG_ERR); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#info(java.lang.String) + */ + public void info(String content) { + project.log(content, Project.MSG_INFO); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#info(java.lang.String, java.lang.Throwable) + */ + public void info(String content, Throwable error) { + project.log(content, Project.MSG_INFO); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#warn(java.lang.String) + */ + public void warn(String content) { + project.log(content, Project.MSG_WARN); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#warn(java.lang.String, java.lang.Throwable) + */ + public void warn(String content, Throwable error) { + project.log(content, Project.MSG_INFO); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#getTemplate(java.lang.String) + */ + public Template getTemplate(String name) throws CompilationException { + return task.getTemplate(name); + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/ant/TemplateCompilerTask.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,380 @@ +/** + * 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.templatecompiler.ant; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.FilenameFilter; +import java.io.InputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Vector; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.builder.TemplateCompiler; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; +import org.apache.velocity.Template; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; + +/** + * Task template compiler. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/26 20:48:56 $ + * + */ +public class TemplateCompilerTask extends Task implements FilenameFilter { + final private static String regexComponent = "^(.*)\\.xhtml$"; + + final private static Pattern patternComponent = Pattern + .compile(regexComponent); + + + private final static String TEMPLATE_FILE_EXT = ".xhtml"; + + /** + * classpath for load component/renderer classes for introspection. + */ + private Path classPath; + + private File srcDir; + + private File destDir; + + protected Vector filesets = new Vector(); + + + /** + * Default constructor + * + * @throws Exception + */ + public TemplateCompilerTask() throws Exception { + super(); + + } + + /** + * getting srcDir + * + * @return Returns the destDir + */ + public File getSrcdir() { + return this.srcDir; + } + + /** + * setting a srcDir + * + * @param destDir + * The srcDir to set. + */ + public void setSrcdir(File srcDir) { + this.srcDir = srcDir; + } + + /** + * getting a destDit + * + * @return Returns the destDir. + */ + public File getDestdir() { + return this.destDir; + } + + /** + * setting a destDir + * + * @param destDir + * The destDir to set. + */ + public void setDestdir(File destDir) { + this.destDir = destDir; + } + + /** + * Generate java class name from template filename + * + * @param fileTemplateName + * a string contain template filename + * @return string contain java class name + */ + public String generateJavaClassName(final String fileTemplateName) { + + String strJavaClassName = "Unknown"; + + Matcher mather = patternComponent.matcher(fileTemplateName); + + if (mather.find()) { + strJavaClassName = mather.group(1); + } // if + + return strJavaClassName; + } + + /** + * + * @param sFileTemplate + */ + public void processTemplate(String sFileTemplate) { + // Generate java class name + + ClassLoader loader = getClassLoader(); + + try { + + CompilationContext componentBean = new AntCompilationContext(this,loader); + TemplateCompiler templateCompiler = new TemplateCompiler(); + + // componentBean.setDefaultVariables(); + + InputStream inputStream = null; + File inputFile = new File(sFileTemplate); + String sF = inputFile.getName().toString(); + + componentBean.setFullClassName(generateJavaClassName(sF)); + + inputStream = new FileInputStream(inputFile); + + templateCompiler.processing(inputStream, componentBean); + + String resultPath = componentBean.getComponentFileName() + ".java"; + File javaFile = new File(getDestdir(), resultPath); + File javaDir = javaFile.getParentFile(); + if (!javaDir.exists()) { + javaDir.mkdirs(); + } // try + + if (javaFile.exists()) { + javaFile.delete(); + } // if + + Writer out = new BufferedWriter(new FileWriter(javaFile)); + + templateCompiler.generateCode(componentBean, out); + + out.flush(); + out.close(); + } catch (FileNotFoundException e) { + throw new BuildException(e); + } catch (Exception e) { + throw new BuildException( + "Error create new Component Java file, message " + + e.getLocalizedMessage(), e); + } // catch + } + + public ClassLoader getClassLoader() { + ClassLoader loader = getProject().createClassLoader(this.classPath); + if (null == loader) { + loader = this.getClass().getClassLoader(); + } + return loader; + } + + /** + * Adds a set of files to copy. + * + * @param set + * a set of files to copy + */ + public void addFileset(FileSet set) { + this.filesets.addElement(set); + } + + final private static String VELOCITY_PROPERTIES = "velocity.properties"; + + + private VelocityEngine engine; + + private Map<String, Template> _templates = new HashMap<String, Template>(); + + + public void init() throws BuildException { + super.init(); + Properties velocityProperties = new Properties(); + try { + InputStream streamVelosityProperties = TemplateCompilerTask.class.getResourceAsStream(VELOCITY_PROPERTIES); + velocityProperties.load(streamVelosityProperties); + engine = new VelocityEngine(); + engine.init(velocityProperties); + } catch(Exception e){ + throw new BuildException("Error init velocity engine",e); + } + } + /* + * (non-Javadoc) + * + * @see org.apache.tools.ant.Task#execute() + */ + public void execute() throws BuildException { + ArrayList arrayFiles = new ArrayList(); + + if (getSrcdir() != null) { + String directory = getSrcdir().toString(); + String[] files = new File(directory).list(this); + for (int i = 0; i < files.length; i++) { + arrayFiles.add(directory + File.separatorChar + files[i]); + } // for + } + + if (this.filesets.size() == 1) { + // deal with the filesets + for (int i = 0; i < this.filesets.size(); i++) { + FileSet fs = (FileSet) this.filesets.elementAt(i); + DirectoryScanner ds = null; + try { + ds = fs.getDirectoryScanner(getProject()); + } catch (BuildException e) { + if (!e.getMessage().endsWith(" not found.")) { + throw e; + } else { + log("Warning: " + e.getMessage()); + continue; + } + } + + File fromDir = fs.getDir(getProject()); + + String[] srcFiles = ds.getIncludedFiles(); + + for (int j = 0; j < srcFiles.length; j++) { + String tempFile = fromDir.getAbsolutePath().toString() + + File.separator + srcFiles[j]; + arrayFiles.add(tempFile); + } + } + + } + + if (arrayFiles.size() == 0) { + log("Empty list"); + } else { + for (Iterator iter = arrayFiles.iterator(); iter.hasNext();) { + String file = (String) iter.next(); + log("Processing file :'" + file + "'"); + processTemplate(file); + } + } + + } + + /** + * Tests if a specified file should be included in a file list. + * + * @param dir + * the directory in which the file was found. + * @param name + * the name of the file. + * @return true if and only if the name should be included in the file list; + * false otherwise. + */ + public boolean accept(File dir, String name) { + if (name.endsWith(TEMPLATE_FILE_EXT)) { + return true; + } + return false; + } + + /** + * Gets the classpath to be used for this compilation. + * + * @return Returns the classpath. + */ + public Path getClasspath() { + return this.classPath; + } + + /** + * Set the classpath to be used for this compilation + * + * @param classpath + * an Ant Path object containing the compilation classpath. + */ + public void setClasspath(Path classpath) { + if (null == this.classPath) { + this.classPath = classpath; + } else { + this.classPath.add(classpath); + } + } + + /** + * Adds a reference to a classpath defined elsewhere. + * + * @param ref + * a reference to a classpath + */ + public void setClasspathRef(Reference ref) { + createClasspath().setRefid(ref); + } + + /** + * Add a path to the classpath + * + * @return a class path to be configured + */ + public Path createClasspath() { + Path classpath = new Path(getProject()); + if (null == this.classPath) { + this.classPath = classpath; + } else { + this.classPath.add(classpath); + } + return classpath; + } + + public Template getTemplate(String name) throws CompilationException { + Template template = _templates.get(name); + if(null == template){ + try { + template = engine.getTemplate(name); + } catch (ResourceNotFoundException e) { + throw new CompilationException(e.getLocalizedMessage()); + } catch (ParseErrorException e) { + throw new CompilationException(e.getLocalizedMessage()); + } catch (Exception e) { + throw new CompilationException(e.getLocalizedMessage()); + } + _templates.put(name, template); + } + return template; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,496 @@ +/** + * 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.templatecompiler.builder; + +import java.beans.PropertyDescriptor; +import java.io.StringWriter; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.ElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElement; +import org.apache.commons.beanutils.MethodUtils; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.w3c.dom.Node; + +/** + * Component Beam. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:42 $ + * + */ +public abstract class AbstractCompilationContext implements CompilationContext { + final private static String VCPBODY = "VCPBODY"; + + final private static String regexComponent = "(.*)" + VCPBODY + "(.*)" + + VCPBODY + "(.*)"; + + final private static Pattern patternComponent = Pattern.compile( + regexComponent, Pattern.UNIX_LINES + Pattern.DOTALL); + + private final static String DEFAULT_BASE_CLASS = "org.ajax4jsf.framework.renderer.RendererBase"; + + private String packageName; + + private String className; + + private String baseClassName; + + private ArrayList<String> declarations; + + private ArrayList<String> imports; + + private String[] EncodeBegin; + + private String[] EncodeEnd; + + private String[] EncodeChildren; + + private HashMap<String, Class> variables = new HashMap<String, Class>(); + + private static String[] defaultImports = new String[] { + "java.util.Iterator", "java.util.Collection", + "java.io.IOException", "javax.faces.component.UIComponent", + "javax.faces.context.FacesContext", + "javax.faces.context.ResponseWriter", + "org.ajax4jsf.framework.renderer.ComponentsVariableResolver", + "org.ajax4jsf.framework.renderer.ComponentVariables" }; + + private TemplateElement tree; + + private ArrayList<ElementsFactory> elementFactories = new ArrayList<ElementsFactory>(); + + + /** + * Name of UIComponent class for this template - can be used for get properties and methods by introspection. + */ + private String componentClass; + + + /** + * Ant Task related classloader for loat UIComponent and Renderer classes for introspection. + */ + private ClassLoader classLoader; + + + public AbstractCompilationContext() { + this.baseClassName = DEFAULT_BASE_CLASS; + this.declarations = new ArrayList<String>(); + this.imports = new ArrayList<String>(); + this.imports.addAll(Arrays.asList(defaultImports)); + // Init default elements factory. + this.elementFactories.add(new A4JRendererElementsFactory()); + } + + /** + * @param loader + * @throws CompilationException + */ + public AbstractCompilationContext(ClassLoader loader) throws CompilationException { + this(); + this.classLoader = loader; + setDefaultVariables(); + } + + + public void addElementsFactory(ElementsFactory factory) { + elementFactories.add(0, factory); + } + /** + * @param componentClass + * The componentClass to set. + * @throws CompilationException + */ + public void setComponentClass(String componentClass) + throws CompilationException { + this.componentClass = componentClass; + addVariable("component", componentClass); + } + + /** + * set a package name + */ + public void setPackageName(final String packageName) { + this.packageName = packageName; + } + + /** + * set a class name + */ + public void setClassName(final String className) { + this.className = className; + } + + /** + * + * @param fullClassName + */ + public void setFullClassName(final String fullClassName) { + int dotIndex = fullClassName.lastIndexOf("."); + + String tempPackageName = ""; + String tempClassName = fullClassName; + + if (dotIndex != -1) { + tempPackageName = fullClassName.substring(0, dotIndex); + tempClassName = fullClassName.substring(dotIndex + 1); + } // if + + setPackageName(tempPackageName); + setClassName(tempClassName); + + } + + public void setBaseclass(String baseclassName) throws CompilationException { + this.baseClassName = baseclassName; + addVariable("this", baseclassName); + } + + // ------ + + /** + * @return package name + */ + public String getPackageName() { + return this.packageName; + } + + /** + * @return base class package name + */ + public String getBaseclassPackageName() { + String packageName = null; + int dotIndex = this.baseClassName.lastIndexOf("."); + + if (dotIndex != -1) { + packageName = this.baseClassName.substring(0, dotIndex); + } + + return packageName; + } + + /** + * @return class name + */ + public String getClassName() { + return this.className; + } + + /** + * @return base class package name + */ + public String getBaseclassName() { + String className = null; + + if ((this.baseClassName != null) && (this.baseClassName.length() != 0)) { + int dotIndex = this.baseClassName.lastIndexOf("."); + + if (dotIndex != -1) { + className = this.baseClassName.substring(dotIndex + 1); + } else { + className = this.baseClassName; + } + } + + return className; + } + + /** + * @return full class name with package name + */ + public String getFullClassName() { + StringBuffer buf = new StringBuffer(); + + if ((this.packageName != null) && (this.packageName.length() != 0)) { + buf.append(this.packageName); + buf.append('.'); + } + + buf.append(this.className); + + return buf.toString(); + } + + /** + * @return base class package name + */ + public String getFullBaseclass() { + return this.baseClassName; + } + + /** + * @return + */ + public String getComponentFileName() { + return getFullClassName().replace('.', '/'); + } + + /** + * @return Returns the componentClass. + */ + public String getComponentClass() { + String returnStr = this.componentClass; + + // if ( (componentClass != null) && ( ! + // componentClass.endsWith(".class")) ) { + // returnStr = componentClass + ".class"; + // } + + return returnStr; + } + + /** + * return class loader + */ + public ClassLoader getClassLoader() { + return this.classLoader; + } + + /** + * @return string array contain declarations + */ + public String[] getDeclarations() { + return this.declarations.toArray(new String[0]); + } + + /** + * @return string array contain declarations + */ + public String[] getImports() { + return this.imports.toArray(new String[0]); + } + + public void addToImport(String className) { + this.imports.add(className); + } + + public void addToDeclaration(String declaration) { + this.declarations.add(declaration); + } + + /** + * Add variable with type String + * + * @param variableName + * @throws CompilationException + */ + public void addVariable(String variableName) throws CompilationException { + addVariable(variableName, "java.lang.String"); + } + + public void addVariable(String variableName, Class clazz) { + this.variables.put(variableName, clazz); + } + + public void addVariable(String variableName, String typeName) + throws CompilationException { + try { + Class clazz = loadClass(typeName); + this.variables.put(variableName, clazz); + } catch (ClassNotFoundException e) { +// error("Error create variable "+variableName+" with type "+typeName, e); + throw new CompilationException("Error create renderer variable "+variableName+" with type "+typeName, e); + } + } + + public boolean containsVariable(String variableName) { + return this.variables.containsKey(variableName); + } + + public Class getVariableType(String variableName) { + return this.variables.get(variableName); + } + + public Class loadClass(String className) throws ClassNotFoundException { + Class clazz = null; + try { + clazz = this.classLoader.loadClass(className); + } catch (ClassNotFoundException e) { + System.err.println("ClassNotFoundException message: " + + e.getMessage()); + } catch (Throwable e) { + e.printStackTrace(); + } + + if (null == clazz) { + System.out.println("Error load class: " + className); + throw new ClassNotFoundException(); + } + return clazz; + } + + public void setDefaultVariables() throws CompilationException { + addVariable("component", "javax.faces.component.UIComponent"); + addVariable("context", "javax.faces.context.FacesContext"); + addVariable("writer", "javax.faces.context.ResponseWriter"); + // addLocalVariable("component", "javax.faces.component.UIComponent" ); + addVariable("variables", + "org.ajax4jsf.framework.renderer.ComponentVariables"); + } + + public Class getMethodReturnedClass(Class clazz, String methodName, + Class[] parametersTypes) { + Class returnedType = null; + System.out.println("class : " + clazz.getName() + "\n\t method : " + + methodName + "\n\t paramTypes : " + + Arrays.asList(parametersTypes).toString()); + + Method method = MethodUtils.getMatchingAccessibleMethod(clazz, + methodName, parametersTypes); + + if (null != method) { + returnedType = method.getReturnType(); + System.out.println("Method found, return type : " + + returnedType.getName()); + } else { + System.out.println("Method not found"); + } + + return returnedType; + } + + public PropertyDescriptor getPropertyDescriptor(Class clazz, + String propertyName) { + PropertyDescriptor returnValue = null; + + PropertyDescriptor[] propertyDescriptors = PropertyUtils + .getPropertyDescriptors(clazz); + + for (int i = 0; i < propertyDescriptors.length; i++) { + PropertyDescriptor descriptor = propertyDescriptors[i]; + if (descriptor.getName().equals(propertyName)) { + returnValue = descriptor; + break; + } + } + + return returnValue; + } + + /** + * + */ + public String[] getEncodeBegin() { + return this.EncodeBegin; + } + + /** + * + */ + public String[] getEncodeChild() { + return this.EncodeChildren; + } + + /** + * + */ + public String[] getEncodeEnd() { + return this.EncodeEnd; + } + + public void setCode(String code) { + + Matcher matcher = patternComponent.matcher(code); + + String strEncodeBegin; + String strEncodeChildren; + String strEncodeEnd; + + if (matcher.find()) { + strEncodeBegin = matcher.group(1); + strEncodeChildren = matcher.group(2); + strEncodeEnd = matcher.group(3); + } else { + strEncodeBegin = ""; + strEncodeChildren = ""; + strEncodeEnd = code; + } + + if ((strEncodeBegin != null) && (strEncodeBegin.length() != 0)) { + this.EncodeBegin = strEncodeBegin.split(";\n"); + } + + if ((strEncodeChildren != null) && (strEncodeChildren.length() != 0)) { + this.EncodeChildren = strEncodeChildren.split(";\n"); + } + + if ((strEncodeEnd != null) && (strEncodeEnd.length() != 0)) { + this.EncodeEnd = strEncodeEnd.split(";\n"); + } + + } + + /** + * @return the tree + */ + public TemplateElement getTree() { + return this.tree; + } + + /** + * @param tree the tree to set + */ + public void setTree(TemplateElement tree) { + this.tree = tree; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#getProcessor(org.w3c.dom.Node) + */ + public TemplateElement getProcessor(Node nodeElement) throws CompilationException { + for (Iterator<ElementsFactory> iter = elementFactories.listIterator(); iter.hasNext();) { + ElementsFactory factory = iter.next(); + TemplateElement processor = factory.getProcessor(nodeElement, this); + if(null != processor){ + return processor; + } + } + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.builder.CompilationContext#processTemplate(java.lang.String, org.apache.velocity.VelocityContext) + */ + public String processTemplate(String name, VelocityContext context) throws CompilationException { + StringWriter out = new StringWriter(); + try { + getTemplate(name).merge(context, out); + } catch (ResourceNotFoundException e) { + throw new CompilationException(e.getLocalizedMessage()); + } catch (ParseErrorException e) { + throw new CompilationException(e.getLocalizedMessage()); + } catch (Exception e) { + throw new CompilationException(e.getLocalizedMessage()); + } + return out.toString(); + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationContext.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationContext.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationContext.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,148 @@ +/** + * 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.templatecompiler.builder; + +import java.beans.PropertyDescriptor; + +import org.ajax4jsf.templatecompiler.elements.TemplateElement; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.Node; + +/** + * Component Beam. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:42 $ + * + */ +public interface CompilationContext { + public void setComponentClass(String componentClass) + throws CompilationException; + + public void setPackageName(final String packageName); + + public void setClassName(final String className); + + public void setFullClassName(final String fullClassName); + + public void setBaseclass(String baseclassName) throws CompilationException; + + public void setCode(String code); + + public void addToImport(String className); + + public void addToDeclaration(String declaration); + + public ClassLoader getClassLoader(); + + public String getPackageName(); + + public String getBaseclassPackageName(); + + public String getClassName(); + + public String getBaseclassName(); + + public String getFullClassName(); + + public String getFullBaseclass(); + + public String getComponentFileName(); + + public String getComponentClass(); + + public String[] getDeclarations(); + + public String[] getImports(); + + /** + * + * @return + */ + public String[] getEncodeBegin(); + + /** + * + * @return + */ + public String[] getEncodeChild(); + + /** + * + * @return + */ + public String[] getEncodeEnd(); + + /** + * Add variable + * + * @param variableName + * @throws CompilationException + */ + public void addVariable(String variableName) throws CompilationException; + + public void addVariable(String variableName, Class clazz); + + public void addVariable(String variableName, String typeName) + throws CompilationException; + + public boolean containsVariable(String variableName); + + public Class getVariableType(String variableName); + + public void setDefaultVariables() throws CompilationException; + + public Class loadClass(String className) throws ClassNotFoundException; + + public Class getMethodReturnedClass(Class clazz, String methodName, + Class[] parametersTypes); + + public PropertyDescriptor getPropertyDescriptor(Class clazz, + String propertyName); + + public TemplateElement getTree(); + + public void setTree(TemplateElement tree); + + + public abstract TemplateElement getProcessor(final Node nodeElement + ) throws CompilationException; + +// public abstract Attribute getAttributeProcessor(final Node attribute +// ) throws CompilationException; + + public abstract Template getTemplate(String name) throws CompilationException; + + public abstract String processTemplate(String name, VelocityContext context) throws CompilationException; + + public void debug(String content); + public void debug(String content,Throwable error); + public void info(String content); + public void info(String content,Throwable error); + public void warn(String content); + public void warn(String content,Throwable error); + public void error(String content); + public void error(String content,Throwable error); + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationException.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationException.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/CompilationException.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,67 @@ +/** + * 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.templatecompiler.builder; + +/** + * @author shura + * + */ +public class CompilationException extends Exception { + + /** + * + */ + private static final long serialVersionUID = 6045782920008419804L; + + /** + * + */ + public CompilationException() { + // TODO Auto-generated constructor stub + } + + /** + * @param message + */ + public CompilationException(String message) { + super(message); + // TODO Auto-generated constructor stub + } + + /** + * @param cause + */ + public CompilationException(Throwable cause) { + super(cause); + // TODO Auto-generated constructor stub + } + + /** + * @param message + * @param cause + */ + public CompilationException(String message, Throwable cause) { + super(message, cause); + // TODO Auto-generated constructor stub + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/StringUtils.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/StringUtils.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/StringUtils.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,123 @@ +/** + * 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.templatecompiler.builder; + +/** + * String utilites. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:21 $ + * + */ +public class StringUtils { + private static final int HEX_DIFF = 'A' - '9' - 1; + + static public String getEscapedString(final String text) { + StringBuffer buf = new StringBuffer(); + + int i = 0; + while (i < text.length()) { + char c = text.charAt(i); + if (isalnum(c)) { + buf.append(c); + } else { + switch (c) { + case '"': + buf.append("\\\""); + break; + case '\n': + buf.append("\\n"); + break; + default: + buf.append(c); + break; + } + } + i++; + } + return buf.toString(); + } + + /* + * static public String getEscapedString( final String text ) { + * + * StringBuffer buf = new StringBuffer(); + * + * int i = 0; while ( i < text.length() ) { char c = text.charAt(i); if ( + * isalnum( c ) ) buf.append( c ); else { switch (c) { case '@': case '*': + * case '-': case '_': //case '+': case '.': case '/': buf.append( c ); + * break; default: buf.append( hex(c) ); break; } } i++; } return + * buf.toString(); } + */ + /** + * Convert a <code>char</code> to a "<code>%hh</code>" string. + * + * @param c + * char to convert + * @return <code>%hh</code> representation of char. + */ + public static String hex(char c) { + int lsi = (c & 0x0F) + '0'; + char lsd = (char) (lsi + ((lsi > '9') ? HEX_DIFF : 0)); + int msi = (c >> 4) + '0'; + char msd = (char) (msi + ((msi > '9') ? HEX_DIFF : 0)); + + return "%" + msd + lsd; + } + + /** + * Returns true if the char isalpha() or isdigit(). + */ + public static boolean isalnum(char c) { + return (isalpha(c) || isdigit(c)); + } + + /** + * Returns true if the char isupper() or islower(). + */ + public static boolean isalpha(char c) { + return (isupper(c) || islower(c)); + } + + /** + * Returns true if the char is from 'A' to 'Z' inclusive. + */ + public static boolean isupper(char c) { + return ((c >= 'A') && (c <= 'Z')); + } + + /** + * Returns true if the char is from 'a' to 'z' inclusive. + */ + public static boolean islower(char c) { + return ((c >= 'a') && (c <= 'z')); + } + + /** + * Returns true if the char is from '0' to '9' inclusive. + */ + public static boolean isdigit(char c) { + return ((c >= '0') && (c <= '9')); + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/TemplateCompiler.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,171 @@ +/** + * 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.templatecompiler.builder; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Writer; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.ajax4jsf.templatecompiler.elements.TemplateElement; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; + +/** + * Template compiler. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/26 20:48:43 $ + * + */ +public class TemplateCompiler { + final private static String CLASS_ATTRIBUTE = "class"; + + final private static String BASECLASS_ATTRIBUTE = "baseclass"; + + final private static String COMPONENT_CLASS_ATTRIBUTE = "component"; + + public static final String TEMPLATES_TEMPLATECOMPILER_PATH = "META-INF/templates/templatecompiler"; + + public static final String TEMPLATES_PATH = "META-INF/templates"; + + final private static String TEMPLATE_FILE = "ComponentTemplate.vm"; + +// private TreeCollectionElement treeElements = new TreeCollectionElement(); + + /** + * Processing input, contain a template + * + * @param input + * InputStream contain template + * @param componentBean + * @throws CompilationException + */ + public void processing(InputStream input, CompilationContext componentBean) + throws CompilationException { + + try { + Document xmlDocument = parseXml(input); + + // Get Root xmlElement + Element rootElement = xmlDocument.getDocumentElement(); + + // Get Attributes + NamedNodeMap attributes = rootElement.getAttributes(); + if (attributes != null) { + Node attributeClass = attributes.getNamedItem(CLASS_ATTRIBUTE); + if (attributeClass != null) { + componentBean.setFullClassName(attributeClass + .getNodeValue()); + } + Node attributeBaseclass = attributes + .getNamedItem(BASECLASS_ATTRIBUTE); + if (attributeBaseclass != null) { + String nodeValue = attributeBaseclass.getNodeValue(); + componentBean.setBaseclass(nodeValue); + } + // Name of base class for UIComponent rendered by template + Node componentClass = attributes + .getNamedItem(COMPONENT_CLASS_ATTRIBUTE); + if (componentClass != null) { + String nodeValue = componentClass.getNodeValue(); + componentBean.setComponentClass(nodeValue); + } + } + + componentBean.setTree(parseElement(rootElement, + componentBean)); + + + } catch (Exception e) { + throw new CompilationException(e); + } + } + + /** + * @param input + * @return + * @throws ParserConfigurationException + * @throws SAXException + * @throws IOException + */ + protected Document parseXml(InputStream input) throws ParserConfigurationException, SAXException, IOException { + // Create Document Builder Factory + DocumentBuilderFactory docFactory = DocumentBuilderFactory + .newInstance(); + + // Create Document Builder + DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); + + // open and parse XML-file + Document xmlDocument = docBuilder.parse(input); + return xmlDocument; + } + + public void generateCode(CompilationContext componentBean,Writer out) throws CompilationException { + + try { + out.write(componentBean.getTree().toCode()); + } catch (IOException e) { + throw new CompilationException(e); + } + + + } + /** + * + * @param element + * @param context + * @return + * @throws CompilationException + */ + private TemplateElement parseElement(Node element, + CompilationContext context) throws CompilationException { + TemplateElement templateElement = null; + templateElement = context.getProcessor(element); + + if (templateElement == null) { + return null; + } + + + if (!templateElement.isSkipBody()) { + NodeList subNodes = element.getChildNodes(); + + for (int iElement = 0; iElement != subNodes.getLength(); iElement++) { + Node subElement = subNodes.item(iElement); + templateElement.addSubElement(parseElement(subElement, + context)); + } // for + }// if + return templateElement; + + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/Variable.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/Variable.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/Variable.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,40 @@ +/** + * 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.templatecompiler.builder; + +/** + * Interface for local and global variable references in EL expressions. + * + * @author shura + * + */ +public interface Variable { + + public Class getType(); + + public String getName(); + + public String getReference(); + + public boolean isGlobal(); + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/CompiledEL.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/CompiledEL.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/CompiledEL.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,143 @@ +/** + * 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.templatecompiler.el; + +import java.util.ArrayList; +import java.util.Iterator; + +/** + * @author yukhovich + * + */ +public class CompiledEL implements ICompiledEL { + + class containedClass { + private Class type; + + private String code; + + public containedClass(String code, Class type) { + this.code = code; + this.type = type; + } + + public Class getType() { + return this.type; + } + + public String getCode() { + return this.code; + } + + } + + private ArrayList childs = new ArrayList(); + + private Class type; + + private String code; + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.el.ICompiledEL#getJavaCode() + */ + public String getJavaCode() { + int i = 0; + + ArrayList tmp = new ArrayList(); + boolean bString = false; + + for (Iterator iter = this.childs.iterator(); iter.hasNext(); i++) { + ICompiledEL element = (ICompiledEL) iter.next(); + + String tmpCode = element.getJavaCode(); + + if (null != element.getType()) { + if (String.class.isAssignableFrom(element.getType())) { + bString = true; + } + + tmp.add(new containedClass(tmpCode, element.getType())); + } + } + + if (null != this.code) { + + if (String.class.isAssignableFrom(this.type)) { + bString = true; + } + + tmp.add(new containedClass(this.code, this.type)); + } + + StringBuffer buf = new StringBuffer(); + + for (Iterator iter = tmp.iterator(); iter.hasNext();) { + containedClass element = (containedClass) iter.next(); + + if (String.class.isAssignableFrom(element.getType())) { + buf.append(element.getCode()); + } else { + if (bString) { + buf.append("ConvertToString(").append(element.getCode()) + .append(")"); + } + } + if (iter.hasNext()) { + buf.append(" + "); + } + + } + + if (bString) { + this.type = String.class; + } else { + this.type = Object.class; + } + + return buf.toString(); + } + + public void addChild(ICompiledEL child) { + this.childs.add(child); + } + + public void setJavaCode(String string) { + setJavaCode(string, java.lang.String.class); + } + + public void setJavaCode(String string, Class type) { + this.code = string; + this.type = type; + + } + + public void setString(String str) { + setJavaCode("\"" + str + "\""); + } + + public Class getType() { + return this.type; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELCompiler.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,508 @@ +/** + * 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.templatecompiler.el; + +import java.beans.PropertyDescriptor; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.el.PropertyNotFoundException; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.StringUtils; +import org.apache.commons.beanutils.PropertyUtils; + +import com.sun.el.parser.ArithmeticNode; +import com.sun.el.parser.AstBracketSuffix; +import com.sun.el.parser.AstDeferredExpression; +import com.sun.el.parser.AstDiv; +import com.sun.el.parser.AstDotSuffix; +import com.sun.el.parser.AstFunction; +import com.sun.el.parser.AstIdentifier; +import com.sun.el.parser.AstInteger; +import com.sun.el.parser.AstLiteralExpression; +import com.sun.el.parser.AstMinus; +import com.sun.el.parser.AstMod; +import com.sun.el.parser.AstMult; +import com.sun.el.parser.AstPlus; +import com.sun.el.parser.AstString; +import com.sun.el.parser.AstValue; +import com.sun.el.parser.ELParser; +import com.sun.el.parser.Node; + +/** + * Compiler EL-expressions. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:12 $ + * + */ +public class ELCompiler implements IELCompiler { + + Map functionsMap = new HashMap(); + + static { + } + + /** + * + */ + public ELCompiler() { + super(); + resetVariables(); + } + + /** + * + */ + public void resetVariables() { + // maps.put("context", "javax.faces.context.FacesContext" ); + // maps.put("component", "javax.faces.component.UIComponent" ); + // maps.put("a4jSkin", "org.ajax4jsf.framework.skin.Skin" ); + + this.functionsMap.put("a4jSkin:getParameter", + "org.ajax4jsf.framework.skin.getParameter"); + } + + public String compileEL(String expression, CompilationContext componentBean) { + Node node = ELParser.parse(expression); + StringBuffer sbMain = new StringBuffer(); + processNode(node, sbMain, componentBean); + return sbMain.toString(); + } + + /** + * Processing node + * + * @param node + * @param sbMain + * @param componentBean + */ + private void processNode(Node node, StringBuffer sbMain, + CompilationContext componentBean) { + int numChildren = node.jjtGetNumChildren(); + + boolean bNeedConversion = false; + for (int i = 0; i < numChildren; i++) { + Node childNode = node.jjtGetChild(i); + if (childNode instanceof AstLiteralExpression) { + bNeedConversion = true; + break; + } + } + + for (int i = 0; i < numChildren; i++) { + Node childNode = node.jjtGetChild(i); + + if (childNode instanceof AstLiteralExpression) { + if (childNode.getImage() != null) { + if (i > 0) { + sbMain.append(" + "); + } + sbMain.append("\""); + sbMain.append(StringUtils.getEscapedString(childNode + .getImage())); + sbMain.append("\""); + + if (i < (numChildren - 1)) { + sbMain.append(" + "); + } + } + } else { + if (bNeedConversion) { + sbMain.append("convertToString("); + } + boolean processing = processingNode(childNode, sbMain, + componentBean); + if (!processing) { + processNode(childNode, sbMain, componentBean); + } + if (bNeedConversion) { + sbMain.append(")"); + } + } + + } + } + + /** + * + * @param node + * @param sbMain + * @param componentBean + * @param cMain + * @return + */ + public boolean processingNode(Node node, StringBuffer sbMain, + CompilationContext componentBean) { + boolean returnValue = false; + if (node instanceof ArithmeticNode) { + returnValue = processingArithmeticNode((ArithmeticNode) node, + sbMain, componentBean); + } else if (node instanceof AstIdentifier) { + returnValue = processingIdentifier((AstIdentifier) node, sbMain, + componentBean); + } else if (node instanceof AstValue) { + returnValue = processingValue((AstValue) node, sbMain, + componentBean); + } else if (node instanceof AstInteger) { + returnValue = processingInteger((AstInteger) node, sbMain); + } else if (node instanceof AstString) { + returnValue = processingString((AstString) node, sbMain); + } else if (node instanceof AstFunction) { + returnValue = processingFunction((AstFunction) node, sbMain, + componentBean); + } else if (node instanceof AstDeferredExpression) { + + } else { + StringBuffer sb = new StringBuffer(); + sb.append(node.toString()); + sb.append(" ("); + sb.append(node.getClass().getName()); + sb.append(")"); + System.out.println(sb.toString()); + } + + return returnValue; + } + + /** + * Processing arithmetic node + * + * @param node + * @param sb + * @param cMain + * @return + */ + private boolean processingArithmeticNode(ArithmeticNode node, + StringBuffer sb, CompilationContext componentBean) { + StringBuffer sb1 = new StringBuffer(); + StringBuffer sb2 = new StringBuffer(); + + boolean returnValue = false; + + Node node1 = node.jjtGetChild(0); + + if (node1 != null) { + if (!(returnValue = processingNode(node.jjtGetChild(0), sb1, + componentBean))) { + System.out.println("Error processing node1: " + + node.jjtGetChild(0).getImage()); + } + } + + if (!(returnValue = processingNode(node.jjtGetChild(1), sb2, + componentBean))) { + System.out.println("Error processing node2: " + + node.jjtGetChild(1).getImage()); + } + + if (returnValue) { + if (node1 != null) { + sb.append(" ( "); + } + + sb.append(sb1); + + if (node instanceof AstDiv) { + sb.append(" / "); + } else if (node instanceof AstMult) { + sb.append(" * "); + } else if (node instanceof AstMod) { + sb.append(" % "); + } else if (node instanceof AstPlus) { + sb.append(" + "); + } else if (node instanceof AstMinus) { + sb.append(" - "); + } + + sb.append(sb2); + + if (node1 != null) { + sb.append(" ) "); + } + } + return returnValue; + } + + /** + * Processing node contain integer + * + * @param node + * @param sb + * @return + */ + private boolean processingInteger(AstInteger node, StringBuffer sb) { + sb.append(node.getImage()); + return true; + } + + /** + * Processing node contain string + * + * @param node + * @param sb + * @return + */ + private boolean processingString(AstString node, StringBuffer sb) { + sb.append("\""); + sb.append(node.getString()); + sb.append("\""); + return true; + } + + /** + * + * @param node + * @param sb + * @return + */ + private boolean processingFunction(AstFunction node, StringBuffer sb, + CompilationContext componentBean) { + + System.out.println("Processing function : " + node.getPrefix()); + System.out.println("Processing function : " + node.getLocalName()); + System.out.println("Processing function : " + node.getOutputName()); + + if (node.getPrefix().equals("this")) { + sb.append(node.getLocalName()); + sb.append("("); + int numChildren = node.jjtGetNumChildren(); + for (int i = 0; i < numChildren; i++) { + Node childNode = node.jjtGetChild(i); + StringBuffer buf = new StringBuffer(); + processingNode(childNode, buf, componentBean); + if (i != 0) { + sb.append(","); + } + sb.append(buf); + } + sb.append(")"); + } else { + String functionName = node.getOutputName(); + if (this.functionsMap.containsKey(functionName)) { + sb.append(this.functionsMap.get(functionName)); + sb.append("("); + int numChildren = node.jjtGetNumChildren(); + for (int i = 0; i < numChildren; i++) { + Node childNode = node.jjtGetChild(i); + StringBuffer buf = new StringBuffer(); + processingNode(childNode, buf, componentBean); + if (i != 0) { + sb.append(","); + } + sb.append(buf); + } + sb.append(")"); + } // if + } // else + return true; + } + + /** + * + * @param node + * @param sb + * @return + */ + private boolean processingIdentifier(AstIdentifier node, StringBuffer sb, + CompilationContext componentBean) { + String variableName = node.getImage(); + if (componentBean.containsVariable(variableName)) { + sb.append(variableName); + } else { + sb.append("variables.getVariable(\""); + sb.append(variableName); + sb.append("\")"); + } + + return true; + } + + /** + * + * @param basketSuffix + * @return + */ + private String processingBracketSuffix(AstBracketSuffix basketSuffix, + CompilationContext componentBean) { + StringBuffer sb = new StringBuffer(); + Node node = basketSuffix.jjtGetChild(0); + if (node instanceof AstIdentifier) { + processingIdentifier((AstIdentifier) node, sb, componentBean); + } else if (node instanceof AstInteger) { + // sb.append("new Integer("); + sb.append(node.getImage()); + // sb.append(")"); + } else if (node instanceof AstString) { + AstString stringNode = (AstString) node; + sb.append("\""); + sb.append(stringNode.getString()); + sb.append("\""); + } else { + sb.append("\""); + sb.append(node.getImage()); + sb.append("\""); + } + return sb.toString(); + } + + /** + * + * @param clazz + * @param propertyName + * @return + */ + private PropertyDescriptor getPropertyDescriptor(Class clazz, + String propertyName) { + PropertyDescriptor returnValue = null; + + PropertyDescriptor[] propertyDescriptors = PropertyUtils + .getPropertyDescriptors(clazz); + + for (int i = 0; i < propertyDescriptors.length; i++) { + PropertyDescriptor descriptor = propertyDescriptors[i]; + if (descriptor.getName().equals(propertyName)) { + returnValue = descriptor; + break; + } + } + + return returnValue; + } + + private boolean processingValue(AstValue node, StringBuffer sb, + CompilationContext componentBean) { + String lastIndexValue = "NULL"; + String lastVariableType = null; + ArrayList names = new ArrayList(); + + for (int i = 0; i < node.jjtGetNumChildren(); i++) { + StringBuffer sb1 = new StringBuffer(); + Node subChild = node.jjtGetChild(i); + + if (subChild instanceof AstIdentifier) { + String variableName = subChild.getImage(); + if (componentBean.containsVariable(variableName)) { + lastVariableType = componentBean.getVariableType( + variableName).getName(); + names.add(variableName); + } else { + processingIdentifier((AstIdentifier) subChild, sb1, + componentBean); + } + } else if (subChild instanceof AstDotSuffix) { + String propertyName = subChild.getImage(); + System.out.println("Object: " + lastVariableType + + ", property: " + propertyName); + + if (lastVariableType != null) { + try { + + Class clazz = componentBean.loadClass(lastVariableType); + + PropertyDescriptor propertyDescriptor = getPropertyDescriptor( + clazz, propertyName); + + if (propertyDescriptor == null) { + throw new PropertyNotFoundException("property: " + + propertyName + " not found in class: " + + lastVariableType); + } + + System.out.println("propertyObject: " + + propertyDescriptor.getPropertyType() + .getName()); + StringBuffer tmpbuf = new StringBuffer(); + tmpbuf.append(propertyDescriptor.getReadMethod() + .getName()); + tmpbuf.append("()"); + names.add(tmpbuf.toString()); + + lastVariableType = propertyDescriptor.getPropertyType() + .getName(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + + } else { + + sb1.append("getProperty("); + sb1.append(lastIndexValue); + sb1.append(","); + sb1.append("\""); + sb1.append(subChild.getImage()); + sb1.append("\")"); + } + } else if (subChild instanceof AstBracketSuffix) { + String bracketSuffix = processingBracketSuffix( + (AstBracketSuffix) subChild, componentBean); + + if (lastVariableType != null) { + StringBuffer tmpbuf = new StringBuffer(); + if (lastVariableType.startsWith("[L")) { + tmpbuf.append("["); + tmpbuf.append(bracketSuffix); + tmpbuf.append("]"); + names.add(tmpbuf.toString()); + } + + if ((lastVariableType.compareTo("java.util.List") == 0) + || (lastVariableType.compareTo("java.util.Map") == 0)) { + tmpbuf.append("get("); + tmpbuf.append(bracketSuffix); + tmpbuf.append(")"); + names.add(tmpbuf.toString()); + } + } else { + + sb1.append("getElelmentByIndex("); + sb1.append(lastIndexValue); + sb1.append(","); + sb1.append(bracketSuffix); + sb1.append(")"); + } + + } + + } + + if (names.size() != 0) { + StringBuffer tmpbuf = new StringBuffer(); + for (Iterator iter = names.iterator(); iter.hasNext();) { + String element = (String) iter.next(); + if (tmpbuf.length() != 0) { + tmpbuf.append("."); + } + tmpbuf.append(element); + } + sb.append(tmpbuf.toString()); + } else { + sb.append(lastIndexValue); + } + + return true; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELParser.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELParser.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ELParser.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,94 @@ +/** + * 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.templatecompiler.el; + +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.StringUtils; + +/** + * EL-parser. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:12 $ + * + */ +public class ELParser { + private static final String SIMPLE_EXPRESSION = "\"%s\""; + + private static ELParser elParser; + + private IELCompiler elCompiler; + + private ELParser() { + this.elCompiler = new ELCompiler(); + } + + private static ELParser getInstance() { + if (elParser == null) { + elParser = new ELParser(); + } + return elParser; + } + + public static String compileEL(String expression, + CompilationContext componentBean) { + return getInstance().getCompiledEL(expression, componentBean); + } + + /** + * + * @param expression + * @return + */ + public String getCompiledEL(String expression, CompilationContext componentBean) { + String returnValue; + if (isVBExpression(expression)) { + returnValue = this.elCompiler.compileEL(expression, componentBean); + } else { + Object[] parameters = new Object[1]; + parameters[0] = StringUtils.getEscapedString(expression); + returnValue = new Formatter().format(SIMPLE_EXPRESSION, parameters) + .toString(); + } + + return returnValue; + } + + /** + * Determine whether String is a value binding expression or not. + */ + public static boolean isVBExpression(String expression) { + if (null == expression) { + return false; + } + int start = 0; + // check to see if attribute has an expression + if (((start = expression.indexOf("#{")) != -1) + && (start < expression.indexOf('}'))) { + return true; + } + return false; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ICompiledEL.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ICompiledEL.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/ICompiledEL.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,40 @@ +/** + * 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.templatecompiler.el; + +/** + * @author yukhovich + * + */ +public interface ICompiledEL { + public void addChild(ICompiledEL child); + + public String getJavaCode(); + + public Class getType(); + + public void setJavaCode(String string); + + public void setJavaCode(String string, Class type); + + public void setString(String escapedString); +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/IELCompiler.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/IELCompiler.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/el/IELCompiler.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,35 @@ +/** + * 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.templatecompiler.el; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; + +/** + * EL-parser. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:12 $ + */ +public interface IELCompiler { + public String compileEL(String expression, CompilationContext componentBean); + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/A4JRendererElementsFactory.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,166 @@ +/** + * 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.templatecompiler.elements; + +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.html.CDATAElement; +import org.ajax4jsf.templatecompiler.elements.html.CommentElement; +import org.ajax4jsf.templatecompiler.elements.html.PIElement; +import org.ajax4jsf.templatecompiler.elements.html.TextElement; +import org.ajax4jsf.templatecompiler.elements.vcp.HeaderScriptsElement; +import org.ajax4jsf.templatecompiler.elements.vcp.HeaderStylesElement; +import org.w3c.dom.Node; + +/** + * Tag processors factory. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * maksimkaszynski $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:44 $ + * + */ +public class A4JRendererElementsFactory implements ElementsFactory { + + public static final String TEMPLATES_PATH = "META-INF/templates"; + + public static final String TEMPLATES_TEMPLATECOMPILER_PATH = TEMPLATES_PATH+"/templatecompiler"; + + private final static String DEFAULT_CLASS_ELEMENT_PROCESSOR = "org.ajax4jsf.templatecompiler.elements.html.HTMLElement"; + + private final static Class[] paramClasses = new Class[] { Node.class, + CompilationContext.class }; + + private final static HashMap<String, String> mapClasses = new HashMap<String, String>(); + + static { + mapClasses + .put("c:set", + "org.ajax4jsf.templatecompiler.elements.std.SetTemplateElement"); + mapClasses.put("c:if", + "org.ajax4jsf.templatecompiler.elements.std.IFTemplateElement"); + mapClasses + .put("c:forEach", + "org.ajax4jsf.templatecompiler.elements.std.ForEachTemplateElement"); + mapClasses + .put("f:clientid", + "org.ajax4jsf.templatecompiler.elements.vcp.FClientIDTemplateElement"); + mapClasses + .put("f:clientId", + "org.ajax4jsf.templatecompiler.elements.vcp.FClientIDTemplateElement"); + mapClasses.put("f:insertComponent", + "org.ajax4jsf.templatecompiler.elements.vcp.InsertComponent"); + + mapClasses + .put("f:call", + "org.ajax4jsf.templatecompiler.elements.vcp.FCallTemplateElement"); + mapClasses + .put("f:resource", + "org.ajax4jsf.templatecompiler.elements.vcp.FResourceTemplateElement"); + + mapClasses + .put("u:insertFacet", + "org.ajax4jsf.templatecompiler.elements.vcp.UInsertFacetTemplateElement"); + + mapClasses + .put("vcp:body", + "org.ajax4jsf.templatecompiler.elements.vcp.VcpBodyTemplateElement"); + mapClasses.put("vcp:mock", ""); + + mapClasses.put("jsp:scriptlet", + "org.ajax4jsf.templatecompiler.elements.jsp.Scriptlet"); + mapClasses.put("jsp:declaration", + "org.ajax4jsf.templatecompiler.elements.jsp.Declaration"); + mapClasses.put("jsp:directive.page", + "org.ajax4jsf.templatecompiler.elements.jsp.DirectivePage"); + mapClasses.put("jsp:expression", + "org.ajax4jsf.templatecompiler.elements.jsp.Expression"); + mapClasses.put("h:styles", HeaderStylesElement.class.getName()); + mapClasses.put("h:scripts", HeaderScriptsElement.class.getName()); + mapClasses.put("f:template", RootElement.class.getName()); + mapClasses.put("f:root", RootElement.class.getName()); + mapClasses.put("jsp:root", RootElement.class.getName()); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.elements.ElementsFactory#getProcessor(org.w3c.dom.Node, org.ajax4jsf.templatecompiler.builder.CompilationContext) + */ + public TemplateElement getProcessor(final Node nodeElement, + final CompilationContext componentBean) throws CompilationException { + TemplateElement returnValue = null; + + short nodeType = nodeElement.getNodeType(); + if (Node.CDATA_SECTION_NODE == nodeType) { + returnValue =new CDATAElement(nodeElement, componentBean); + } else if (Node.TEXT_NODE == nodeType) { + returnValue =new TextElement(nodeElement, componentBean); + } else if (Node.COMMENT_NODE == nodeType) { + returnValue =new CommentElement(nodeElement, componentBean); + } else if (Node.PROCESSING_INSTRUCTION_NODE == nodeType) { + returnValue =new PIElement(nodeElement, componentBean); + } else if (Node.ELEMENT_NODE == nodeType) { + String className = (String) mapClasses.get(nodeElement.getNodeName()); + + if (className == null) { + className = DEFAULT_CLASS_ELEMENT_PROCESSOR; + } + + if (!className.equals("")) { + Class class1; + try { + System.out.println("loading class: " + className); + + class1 = Class.forName(className); + Object[] objects = new Object[2]; + objects[0] = nodeElement; + objects[1] = componentBean; + + returnValue = (TemplateElement) class1.getConstructor( + paramClasses).newInstance(objects); + } catch (InstantiationException e) { + throw new CompilationException("InstantiationException: " + + e.getLocalizedMessage(), e); + } catch (IllegalAccessException e) { + throw new CompilationException("IllegalAccessException: " + + e.getLocalizedMessage(), e); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + throw new CompilationException("InvocationTargetException: " + + e.getMessage(), e); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + throw new CompilationException(" error loading class: " + + e.getLocalizedMessage()); + } + } + } + return returnValue; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/Attribute.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/Attribute.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/Attribute.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,40 @@ +/** + * 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.templatecompiler.elements; + +/** + * Interface for HTLM-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:44 $ + * + */ +public interface Attribute { + public void copyValues(final Attribute src); + + public String getName(); + + public String getValue(); + + public String getCode(); +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/BodyElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/BodyElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/BodyElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,31 @@ +/** + * 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.templatecompiler.elements; + +/** + * Marker interface for central body element ( for renderer, contain encodeChildren method content ) + * @author shura + * + */ +public interface BodyElement { + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/DeclarationElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/DeclarationElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/DeclarationElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,32 @@ +/** + * 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.templatecompiler.elements; + +/** + * Marker interdace for {@link TemplateElement} processed as declaration, outside + * of encode... methods + * @author shura + * + */ +public interface DeclarationElement { + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsArray.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsArray.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsArray.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,55 @@ +/** + * 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.templatecompiler.elements; + +import java.util.ArrayList; +import java.util.Iterator; + +import org.ajax4jsf.templatecompiler.builder.CompilationException; + +/** + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:45 $ + * + */ +class ElementsArray extends ArrayList<TemplateElement> { + /** + * + */ + private static final long serialVersionUID = 1L; + + public String toCode() throws CompilationException { + StringBuffer buf = new StringBuffer(); + + Iterator<TemplateElement> i = iterator(); + boolean hasNext = i.hasNext(); + while (hasNext) { + TemplateElement o = i.next(); + if (o != null) { + buf.append(o.toCode()); + } + hasNext = i.hasNext(); + } // while + return buf.toString(); + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsFactory.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsFactory.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/ElementsFactory.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,37 @@ +/** + * 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.templatecompiler.elements; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public interface ElementsFactory { + + public abstract TemplateElement getProcessor(final Node nodeElement, + final CompilationContext componentBean) throws CompilationException; + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/JSTLElementsFactory.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,43 @@ +/** + * 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.templatecompiler.elements; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class JSTLElementsFactory implements ElementsFactory { + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.elements.ElementsFactory#getProcessor(org.w3c.dom.Node, org.ajax4jsf.templatecompiler.builder.CompilationContext) + */ + public TemplateElement getProcessor(Node nodeElement, + CompilationContext componentBean) throws CompilationException { + // TODO Auto-generated method stub + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/RootElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/RootElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/RootElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,196 @@ +/** + * 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.templatecompiler.elements; + +import java.util.Iterator; +import java.util.ListIterator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.vcp.VcpBodyTemplateElement; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class RootElement extends TemplateElementBase { + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/ComponentTemplate.vm"; + private static final String ENCODE_BEGIN_TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/EncodeBegin.vm"; + private static final String ENCODE_END_TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/EncodeEnd.vm"; + private static final String ENCODE_CHILDREN_TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/EncodeChildren.vm"; + + final private static String regexComponent = "(.*)" + VcpBodyTemplateElement.STR_VCB_BODY + "(.*)" + + VcpBodyTemplateElement.STR_VCB_BODY + "(.*)"; + + final private static Pattern patternComponent = Pattern.compile( + regexComponent, Pattern.UNIX_LINES + Pattern.DOTALL); + + /** + * @param element + * @param componentBean + */ + public RootElement(Node element, CompilationContext componentBean) { + super(element, componentBean); + // TODO apply global attributes + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getBeginElement() + */ + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + context.put("component", this.getComponentBean()); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.templatecompiler.elements.TemplateElementBase#toCode() + */ + public String toCode() throws CompilationException { + VelocityContext context = new VelocityContext(); + context.put("component", this.getComponentBean()); + StringBuffer code = new StringBuffer(); + String beginElement = this.getBeginElement(); + if (null != beginElement) { + code.append(beginElement); + code.append("\n"); + } + StringBuffer declarationsCode = new StringBuffer(); + StringBuffer methodCode = new StringBuffer(); + for (ListIterator<TemplateElement> iter = getSubElements().listIterator(); iter.hasNext();) { + TemplateElement element = iter.next(); + String toCode = element.toCode(); + if(element instanceof DeclarationElement){ + declarationsCode.append(toCode); + } /*else if(element instanceof BodyElement){ + // All collected code put to encodeBegin method. + if (methodCode.length()>0) { + context.put("body", methodCode.toString()); + code.append(this.getComponentBean().processTemplate( + getEncodeBeginTemplateName(), context)); + } + // If body contain any code, create encodeChildren method. + if (toCode.length()>0) { + context.put("body", toCode); + code.append(this.getComponentBean().processTemplate( + getEncodeChildrenTemplateName(), context)); + } + methodCode = new StringBuffer(); + } */ + else { + methodCode.append(toCode); + } + } + + if (methodCode.length()>0) { + + Matcher matcher = patternComponent.matcher(methodCode); + + String strEncodeBegin; + String strEncodeChildren; + String strEncodeEnd; + + if (matcher.find()) { + strEncodeBegin = matcher.group(1); + // put content before body element to encodeBegin + if (strEncodeBegin.trim().length()>0) { + context.put("body", strEncodeBegin); + code.append(this.getComponentBean().processTemplate( + getEncodeBeginTemplateName(), context)); + } + strEncodeChildren = matcher.group(2); + if (strEncodeChildren.trim().length()>0 ) { + // put content of body element + context.put("body", strEncodeChildren); + code.append(this.getComponentBean().processTemplate( + getEncodeChildrenTemplateName(), context)); + } + + strEncodeEnd = matcher.group(3); + if(strEncodeEnd.trim().length()>0){ + // All code after body put to encodeEnd method. + context.put("body", strEncodeEnd); + code.append(this.getComponentBean().processTemplate( + getEncodeEndTemplateName(), context)); + } + } else { + // All collected code put to encodeEnd method. + context.put("body", methodCode.toString()); + code.append(this.getComponentBean().processTemplate( + getEncodeEndTemplateName(), context)); + } + } + if(declarationsCode.length()>0){ + code.append(declarationsCode); + } + String endElement = this.getEndElement(); + if (endElement != null) { + code.append(endElement); + code.append("\n"); + } + return code.toString(); + } + + /** + * @return + */ + protected String getEncodeBeginTemplateName() { + return ENCODE_BEGIN_TEMPLATE; + } + + /** + * @return + */ + protected String getEncodeEndTemplateName() { + return ENCODE_END_TEMPLATE; + } + /** + * @return + */ + protected String getEncodeChildrenTemplateName() { + return ENCODE_CHILDREN_TEMPLATE; + } + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getEndElement() + */ + public String getEndElement() throws CompilationException { + // TODO Auto-generated method stub + return "\n}"; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,51 @@ +/** + * 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.templatecompiler.elements; + +import java.util.ArrayList; + +import org.ajax4jsf.templatecompiler.builder.CompilationException; + +/** + * Intarace for tag processors. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:43 $ + * + */ +public interface TemplateElement { + public String getBeginElement() throws CompilationException; + + public String getEndElement() throws CompilationException; + + public boolean isSkipBody(); + + public void addSubElement(TemplateElement e); + + public String toCode() throws CompilationException; + + /** + * @return the subElements + */ + public ArrayList<TemplateElement> getSubElements(); + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/TemplateElementBase.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,93 @@ +/** + * 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.templatecompiler.elements; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.Node; + +/** + * Abstract base class for tag processors. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:44 $ + */ +public abstract class TemplateElementBase implements TemplateElement { + + + private CompilationContext componentBean; + + private ElementsArray subElements = new ElementsArray(); + + + public TemplateElementBase(final Node element, + final CompilationContext componentBean) { + this.componentBean = componentBean; + }; + + public boolean isSkipBody() { + // by default, children process by compiler. + return false; + } + + public void addSubElement(TemplateElement e) { + this.subElements.add(e); + } + + public String toCode() throws CompilationException { + StringBuffer buf = new StringBuffer(); + + String beginElement = this.getBeginElement(); + if (null != beginElement) { + buf.append(beginElement); + buf.append("\n"); + } + + if (this.subElements.size() != 0) { + buf.append(this.subElements.toCode()); + } + + String endElement = this.getEndElement(); + if (endElement != null) { + buf.append(endElement); + buf.append("\n"); + } + + return buf.toString(); + } + + /** + * @return the componentBean + */ + public CompilationContext getComponentBean() { + return componentBean; + } + + /** + * @return the subElements + */ + public ElementsArray getSubElements() { + return this.subElements; + } + + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CDATAElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,69 @@ +/** + * 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.templatecompiler.elements.html; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class CDATAElement extends TemplateElementBase { + + private String htmlText; + + public CDATAElement(Node element, CompilationContext componentBean) { + super(element, componentBean); + this.htmlText = element.getNodeValue(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getBeginElement() + */ + public String getBeginElement() { + StringBuffer retValue = new StringBuffer(); + if ((null != this.htmlText) && (this.htmlText.length() > 0)) { + retValue.append(" writer.write(\"<![CDATA[\");\n"); + retValue.append(" writer.write(convertToString(").append( + ELParser.compileEL(this.htmlText, this.getComponentBean())) + .append("));\n"); + retValue.append(" writer.write(\"]]>\");\n"); + } + return retValue.toString(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getEndElement() + */ + public String getEndElement() { + // Do nothitg - text not have childs + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CommentElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CommentElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/CommentElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,70 @@ +/** + * 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.templatecompiler.elements.html; + +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class CommentElement extends TemplateElementBase { + + private String htmlText; + + public CommentElement(Node element, CompilationContext componentBean) { + super(element, componentBean); + this.htmlText = element.getNodeValue(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getBeginElement() + */ + public String getBeginElement() { + String retValue = null; + if ((null != this.htmlText) && (this.htmlText.length() > 0)) { + Object[] params = { ELParser.compileEL(this.htmlText, this.getComponentBean()) }; + retValue = new Formatter().format( + "writer.writeComment(convertToString(%s));\n", params) + .toString(); + } + return retValue; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getEndElement() + */ + public String getEndElement() { + // Do nothitg - text not have childs + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLAttributes.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,63 @@ +/** + * 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.templatecompiler.elements.html; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.ajax4jsf.templatecompiler.elements.Attribute; + +/** + * Processing HTLM-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:41 $ + * + */ +public class HTMLAttributes { + private LinkedHashMap attributesMap = new LinkedHashMap(); + + + public void addAttribute(String nameAttribute, String valueAttribute) { + + Attribute attribute = HtmlAttributesFactory.getProcessor( + nameAttribute, valueAttribute); + + if (attribute != null) { + Attribute oldElemet = (Attribute) this.attributesMap.get(attribute + .getName()); + + if (oldElemet != null) { + oldElemet.copyValues(attribute); + } else { + this.attributesMap.put(attribute.getName(), attribute); + } + } else { + System.out.println("attribute is null"); + } + } + + public Map getAttributes() { + return this.attributesMap; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,191 @@ +/** + * 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.templatecompiler.elements.html; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing template HTLM-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:42 $ + * + */ +public class HTMLElement extends TemplateElementBase { + final static private String PRE_TAG_NAME = "pre"; + + private static final String PASS_THRU_ATTR = "x:passThruWithExclusions"; + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH + + "/HTMLElement.vm"; + + private String htmlTag; + + private String htmlText; + + private HTMLAttributes htmlAttributes = new HTMLAttributes(); + + private ArrayList passThruAttributes = null; + + private CompilationContext componentBean; + + /** + * + * @param element + * @param variables + */ + public HTMLElement(final Node element, + final CompilationContext componentBean) { + super(element, componentBean); + + this.passThruAttributes = null; + this.htmlTag = element.getNodeName(); + this.componentBean = componentBean; + processingAttributes(element.getAttributes()); + } + + /** + * @return string contain + * @throws CompilationException + */ + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + context.put("htmlTag", this.htmlTag); + context.put("htmlAttributes", this.htmlAttributes.getAttributes()); + context.put("passThruAttributes", this.passThruAttributes); + if (this.htmlText != null) { + context.put("htmlText", this.htmlText); + } + return this.componentBean.processTemplate(getTemplateName(), context); + + } + + /** + * @return + */ + protected String getTemplateName() { + // TODO Auto-generated method stub + return TEMPLATE; + } + + /** + * @return + */ + public String getEndElement() { + String sReturnValue; + + Object[] objects = new Object[1]; + objects[0] = this.htmlTag; + + sReturnValue = new Formatter().format("writer.endElement(\"%s\");", + objects).toString(); + return sReturnValue; + } + + /** + * + * @param attributes + */ + public void processingAttributes(NamedNodeMap attributes) { + if (attributes == null) { + return; + } + + for (int iElement = 0; iElement != attributes.getLength(); iElement++) { + Node attribute = attributes.item(iElement); + String attributeName = attribute.getNodeName(); + String attributeValue = attribute.getNodeValue(); + + if (attributeName.equals(PASS_THRU_ATTR)) { + processingPassThruAtrribute(attributeValue); + } else { + this.htmlAttributes.addAttribute(attributeName, ELParser + .compileEL(attributeValue, this.componentBean)); + } + + } // for + } + + /** + * + * @param listPassThruAttributes + */ + private void processingPassThruAtrribute(String listPassThruAttributes) { + this.passThruAttributes = new ArrayList(); + ArrayList tempPassThruAttributes = HTMLTags.getAttributes(this.htmlTag); + + String[] excludeAttributes = listPassThruAttributes.split(","); + + Arrays.sort(excludeAttributes); + + for (int i = 0; i < tempPassThruAttributes.size(); i++) { + String attr = (String) tempPassThruAttributes.get(i); + + int iTemp = Arrays.binarySearch(excludeAttributes, attr); + + if (iTemp < 0) { + this.passThruAttributes.add(attr); + } // if + + } // for + + Collections.sort(this.passThruAttributes); + } + + /** + * Set a body text for HTML-tag + * + * @param nodeText + */ + public void setText(final String nodeText) { + String tempStr = null; + // if TAG is not PRE test do not trim + if (nodeText.trim().length() != 0) { + if (this.htmlTag.compareToIgnoreCase(PRE_TAG_NAME) == 0) { + tempStr = nodeText; + } else { + tempStr = nodeText.trim(); + } + } + + if (null != tempStr) { + if (null == this.htmlText) { + this.htmlText = ELParser.compileEL(tempStr, this.componentBean); + } else { + this.htmlText = this.htmlText + + ELParser.compileEL(tempStr, this.componentBean); + } + } + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HTMLTags.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,73 @@ +/** + * 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.templatecompiler.elements.html; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.ArrayList; +import java.util.HashMap; + +/** + * @author yukhovich + * + */ +public class HTMLTags { + private static final String TEMPLATES_TEMPLATECOMPILER_TAGS_BIN = "META-INF/templates/templatecompiler/tags.bin"; + + private static HashMap tags; + + private static boolean b = false; + + static { + + InputStream is = HTMLTags.class.getClassLoader().getResourceAsStream( + TEMPLATES_TEMPLATECOMPILER_TAGS_BIN); + try { + ObjectInputStream in = new ObjectInputStream(is); + + tags = (HashMap) in.readObject(); + + in.close(); + + b = true; + + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static boolean getS() { + return b; + } + + public static ArrayList getAttributes(String tagName) { + if (b) { + return (ArrayList) tags.get(tagName); + } else { + return null; + } + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/HtmlAttributesFactory.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,93 @@ +/** + * 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.templatecompiler.elements.html; + +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; + +import org.ajax4jsf.templatecompiler.elements.Attribute; + +/** + * Factory for processing HTLM-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:42 $ + * + */ +public class HtmlAttributesFactory { + private final static String DEFAULT_CLASS_ATTRIBUTE_PROCESSOR = "org.ajax4jsf.templatecompiler.elements.html.attribute.HtmlAttribute"; + + private final static Class[] paramClasses = new Class[] { String.class, + String.class }; + + private final static HashMap mapClasses = new HashMap(); + + static { + // mapClasses.put("x:passThruWithExclusions", + // "org.ajax4jsf.templatecompiler.elements.html.attribute.PassThruWithExclusions"); + mapClasses.put("x:otherParameters", ""); + } + + public static Attribute getProcessor(String attributeName, + String attributeValue) { + Attribute returnValue = null; + + String className = (String) mapClasses.get(attributeName); + + if (className == null) { + className = DEFAULT_CLASS_ATTRIBUTE_PROCESSOR; + } + + if (!className.equals("")) { + Class class1; + try { + class1 = Class.forName(className); + try { + try { + Object[] objects = new Object[2]; + objects[0] = attributeName; + objects[1] = attributeValue; + returnValue = (Attribute) class1.getConstructor( + paramClasses).newInstance(objects); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } catch (ClassNotFoundException e1) { + e1.printStackTrace(); + } + } + + return returnValue; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/PIElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/PIElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/PIElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,68 @@ +/** + * 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.templatecompiler.elements.html; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class PIElement extends TemplateElementBase { + + private String htmlText; + + public PIElement(Node element, CompilationContext componentBean) { + super(element, componentBean); + this.htmlText = element.getNodeValue(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getBeginElement() + */ + public String getBeginElement() { + StringBuffer retValue = new StringBuffer(); + if ((null != this.htmlText) && (this.htmlText.length() > 0)) { + retValue.append(" writer.write(\"<![CDATA[\");\n"); + retValue.append(" writer.write(").append( + ELParser.compileEL(this.htmlText, this.getComponentBean())).append(");\n"); + retValue.append(" writer.write(\"]]>\");\n"); + } + return null; // retValue.toString(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getEndElement() + */ + public String getEndElement() { + // Do nothitg - text not have childs + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/TextElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/TextElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/TextElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,70 @@ +/** + * 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.templatecompiler.elements.html; + +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * @author shura + * + */ +public class TextElement extends TemplateElementBase { + + private String htmlText; + + public TextElement(Node element, CompilationContext componentBean) { + super(element, componentBean); + this.htmlText = element.getNodeValue().trim(); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getBeginElement() + */ + public String getBeginElement() { + String retValue = null; + if ((null != this.htmlText) && (this.htmlText.length() > 0)) { + Object[] params = { ELParser.compileEL(this.htmlText, this.getComponentBean()) }; + retValue = new Formatter().format( + "writer.writeText(convertToString(%s),null);\n", params) + .toString(); + } + return retValue; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.TemplateElement#getEndElement() + */ + public String getEndElement() { + // Do nothitg - text not have childs + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/HtmlAttribute.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,109 @@ +/** + * 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.templatecompiler.elements.html.attribute; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.ajax4jsf.templatecompiler.elements.Attribute; + +/** + * Processing template simple HTLM-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/26 20:48:55 $ + * + */ +public class HtmlAttribute implements Attribute { + final private static String regexAttributeName = "x:(.*)"; + + final private static Pattern patternAttributeName = Pattern + .compile(regexAttributeName); + + private String name; + + private String value; + + private boolean isNoRewrite; + + /** + * + * @param attributeName + * @param attributeValue + */ + public HtmlAttribute(String attributeName, String attributeValue) { + Matcher mather = patternAttributeName.matcher(attributeName); + + if (mather.find()) { + this.name = mather.group(1); + this.isNoRewrite = true; + } else { + this.name = attributeName; + this.isNoRewrite = false; + } + this.value = attributeValue; + } + + /** + * + */ + public String getName() { + return this.name; + } + + /** + * + */ + public String getValue() { + return this.value; + } + + /** + * + * @return + */ + public boolean isNoRewrite() { + return this.isNoRewrite; + } + + /** + * copy values from + * + * @param src + */ + public void copyValues(final Attribute src) { + if (src instanceof HtmlAttribute) { + + if (!isNoRewrite()) { + this.value = ((HtmlAttribute) src).getValue(); + this.isNoRewrite = ((HtmlAttribute) src).isNoRewrite(); + } + } + } + + /** + * + */ + public String getCode() { + return null; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/html/attribute/PassThruWithExclusions.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,79 @@ +/** + * 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.templatecompiler.elements.html.attribute; + +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.elements.Attribute; + +/** + * Processing template PassThruWithExclusions-attributes. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/26 20:48:55 $ + * + */ +public class PassThruWithExclusions implements Attribute { + private String name; + + private String value; + + public PassThruWithExclusions(String attributeName, String attributeValue) { + this.name = attributeName; + this.value = attributeValue; + } + + public void copyValues(Attribute src) { + if (src instanceof PassThruWithExclusions) { + this.value = ((PassThruWithExclusions) src).getValue(); + } + } + + public String getName() { + return this.name; + } + + public String getValue() { + return this.value; + } + + public String getCode() { + String sReturnValue; + + if (this.value.length() == 0) { + sReturnValue = "getUtils().encodePassThru(context, component);"; + } else { + Object[] objects = new Object[1]; + objects[0] = this.value; + + sReturnValue = new Formatter() + .format( + "getUtils().encodePassThruWithExclusions(context, component, \"%s\");", + objects).toString(); + + } + + return sReturnValue; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Declaration.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,56 @@ +/** + * 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.templatecompiler.elements.jsp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * Processing jsp:declaration-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:41 $ + */ +public class Declaration extends TemplateElementBase { + + public Declaration(Node element, CompilationContext componentBean) { + super(element, componentBean); + + if (element.getTextContent().length() != 0) { + componentBean.addToDeclaration(element.getTextContent()); + } + } + + public String getBeginElement() { + return null; + } + + public String getEndElement() { + return null; + } + + public boolean isSkipBody() { + // content processed by element + return true; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectiveInclude.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,51 @@ +/** + * 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.templatecompiler.elements.jsp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * Processing jsp:directive.include-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:40 $ + */ +public class DirectiveInclude extends TemplateElementBase { + + public DirectiveInclude(Node element, CompilationContext componentBean) { + super(element, componentBean); + + System.out.println("text:" + element.getTextContent()); + } + + public String getBeginElement() { + return null; + } + + public String getEndElement() { + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/DirectivePage.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,71 @@ +/** + * 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.templatecompiler.elements.jsp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.DOMException; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing jsp:directive.page-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:52 $ + */ +public class DirectivePage extends TemplateElementBase { + private static final String EXTENDS_ATTRIBUTE = "extends"; + + private static final String IMPORT_ATTRIBUTE = "import"; + + public DirectivePage(Node element, CompilationContext componentBean) + throws DOMException, CompilationException { + super(element, componentBean); + + NamedNodeMap nnm = element.getAttributes(); + + Node nodeExtends = nnm.getNamedItem(EXTENDS_ATTRIBUTE); + if ((null != nodeExtends) && (nodeExtends.getNodeValue().length() != 0)) { + componentBean.setBaseclass(nodeExtends.getNodeValue()); + } + + Node nodeImports = nnm.getNamedItem(IMPORT_ATTRIBUTE); + if ((null != nodeImports) && (nodeImports.getNodeValue().length() != 0)) { + String[] imports = nodeImports.getNodeValue().split("\\,"); + for (int i = 0; i < imports.length; i++) { + componentBean.addToImport(imports[i].trim()); + } // for + } // if + } + + public String getBeginElement() { + return null; + } + + public String getEndElement() { + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Expression.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Expression.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Expression.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,58 @@ +/** + * 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.templatecompiler.elements.jsp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * Processing jsp:expression-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:41 $ + */ +public class Expression extends TemplateElementBase { + private String expressionText; + + public Expression(Node element, CompilationContext componentBean) { + super(element, componentBean); + + if (element.getTextContent().length() != 0) { + this.expressionText = element.getTextContent(); + } + } + + public String getBeginElement() { + return this.expressionText; + } + + public String getEndElement() { + return null; + } + + public boolean isSkipBody() { + // no content must be processed. + return true; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/jsp/Scriptlet.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,58 @@ +/** + * 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.templatecompiler.elements.jsp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * Processing jsp:scriplet-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:17:41 $ + */ +public class Scriptlet extends TemplateElementBase { + private String scripletText; + + public Scriptlet(Node element, CompilationContext componentBean) { + super(element, componentBean); + + if (element.getTextContent().length() != 0) { + this.scripletText = element.getTextContent(); + } + } + + public String getBeginElement() { + return this.scripletText; + } + + public String getEndElement() { + return null; + } + + public boolean isSkipBody() { + // text content processed by element + return true; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ForEachTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,120 @@ +/** + * 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.templatecompiler.elements.std; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing c:forEach-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/26 20:48:39 $ + */ +public class ForEachTemplateElement extends TemplateElementBase { + private static int indexForCollection = 0; + + private static final String ATTRIBUTE_FROM = "begin"; + + private static final String ATTRIBUTE_TO = "end"; + + private String strItems; + + private String strFrom; + + private String strTo; + + private String strThisVariable; + + public ForEachTemplateElement(final Node element, + final CompilationContext componentBean) { + super(element, componentBean); + + NamedNodeMap nnm = element.getAttributes(); + + Node varItem = nnm.getNamedItem("var"); + this.strThisVariable = varItem.getNodeValue(); + + Node items = nnm.getNamedItem("items"); + if (items != null) { + this.strItems = ELParser.compileEL(items.getNodeValue(), componentBean); + } else { + Node fromItem = nnm.getNamedItem(ATTRIBUTE_FROM); + Node toItem = nnm.getNamedItem(ATTRIBUTE_TO); + + this.strFrom = ELParser + .compileEL(fromItem.getNodeValue(), componentBean); + this.strTo = ELParser.compileEL(toItem.getNodeValue(), componentBean); + } + } + + /** + * @throws CompilationException + * + */ + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + String templateName; + if (this.strItems != null) { + indexForCollection++; + templateName = getTemplate1Name();//"FORElement_1.vm"); + context.put("items", this.strItems); + context.put("index", new Integer(indexForCollection)); + } else { + templateName = getTemplate2Name();//"FORElement_2.vm"); + context.put("from", this.strFrom); + context.put("to", this.strTo); + } + + context.put("item", this.strThisVariable); + return this.getComponentBean().processTemplate(templateName, context); + } + + /** + * @return + */ + protected String getTemplate2Name() { + return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_1.vm"; + } + + /** + * @return + */ + protected String getTemplate1Name() { + return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/FORElement_2.vm"; + } + + /** + * + */ + public String getEndElement() { + return "}"; + } + +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/IFTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,73 @@ +/** + * 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.templatecompiler.elements.std; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing c:if-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:39 $ + */ +public class IFTemplateElement extends TemplateElementBase { + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/IFElement.vm"; + private String sExpression; + + + public IFTemplateElement(final Node element, + final CompilationContext componentBean) { + super(element, componentBean); + + NamedNodeMap nnm = element.getAttributes(); + String strTempExpression = nnm.getNamedItem("test").getNodeValue(); + ; + + this.sExpression = ELParser.compileEL(strTempExpression, componentBean); + } + + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + + context.put("if", this.sExpression); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + return "}"; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/SetTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,87 @@ +/** + * 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.templatecompiler.elements.std; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing c:set-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:39 $ + */ +public class SetTemplateElement extends TemplateElementBase { + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/set.vm"; + + private String strThisVariable; + + private String strExpression; + + + public SetTemplateElement(final Node element, + final CompilationContext componentBean) { + super(element, componentBean); + + String strTempExpression; + + NamedNodeMap nnm = element.getAttributes(); + String sVariableName = nnm.getNamedItem("var").getNodeValue(); + Node value = nnm.getNamedItem("value"); + + if (value != null) { + strTempExpression = value.getNodeValue(); + } else { + strTempExpression = element.getTextContent(); + } + + this.strThisVariable = sVariableName; + + this.strExpression = ELParser.compileEL(strTempExpression, componentBean); + } + + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + context.put("variable", this.strThisVariable); + context.put("expression", this.strExpression); + return this.getComponentBean().processTemplate(getTemplateName(), context); + + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + return null; + } +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FCallTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,323 @@ +/** + * 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.templatecompiler.elements.vcp; + +import java.beans.PropertyDescriptor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:call-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:47 $ + */ +public class FCallTemplateElement extends TemplateElementBase { + private String functionName; + + private String variable; + + private String fullFunctionName; + + private boolean useOnlyEnumeratingParaments; + + private final static String FUNCTION_DELIMITER = "\\."; + + private final static String VAR_ATTRIBUTE_NAME = "var"; + + private final static String FUNCTION_NAME_ATTRIBUTE_NAME = "name"; + + private final static String USE_ONLY_THIS_PARAMETERS = "use_only_this_parameters"; + + private final static String[][] PARAM_NAMES = new String[][] { + { "context" }, { "context", "component" } }; + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/insertCall.vm"; + + + private ArrayList parameters; + + public FCallTemplateElement(final Node element, + final CompilationContext componentBean) throws CompilationException { + super(element, componentBean); + + this.useOnlyEnumeratingParaments = false; + + NamedNodeMap nnm = element.getAttributes(); + Node functionNameNode = nnm.getNamedItem(FUNCTION_NAME_ATTRIBUTE_NAME); + + if (functionNameNode != null) { + this.functionName = functionNameNode.getNodeValue(); + } else { + throw new CompilationException("function name is not set"); + } + + Node nodeUseOnlyThisParameters = nnm + .getNamedItem(USE_ONLY_THIS_PARAMETERS); + if (nodeUseOnlyThisParameters != null) { + this.useOnlyEnumeratingParaments = Boolean + .getBoolean(nodeUseOnlyThisParameters.getNodeValue()); + } // if + + // read name of variable if need + Node variableName = nnm.getNamedItem(VAR_ATTRIBUTE_NAME); + if (variableName != null) { + this.variable = variableName.getNodeValue(); + } // if + + // read name of parameters if need + ParameterProcessor parameterProcessor = new ParameterProcessor(element, + componentBean); + + this.parameters = parameterProcessor.getParameters(); + System.out.println(this.parameters); + + List decodeFunctionName = null; + + decodeFunctionName = Arrays.asList(this.functionName + .split(FUNCTION_DELIMITER)); + if (null == decodeFunctionName) { + decodeFunctionName = new ArrayList(); + decodeFunctionName.add(this.functionName); + } + + ArrayList functionNames = new ArrayList(); + String lastClassName = componentBean.getFullBaseclass(); + + for (Iterator iter = decodeFunctionName.iterator(); iter.hasNext();) { + String elementFunction = (String) iter.next(); + + try { + System.out.println("Try to load class : " + lastClassName); + + Class clazz = componentBean.loadClass(lastClassName); + + if (!iter.hasNext()) { + String method = getMethod(clazz, elementFunction); + if (method != null) { + System.out.println(method); + functionNames.add(method); + } else { + System.out.println("Method " + elementFunction + + " not found in class : " + lastClassName); + throw new CompilationException(); + } + + } else { + // + // Probing properties !!!! + // + + PropertyDescriptor propertyDescriptor = getPropertyDescriptor( + clazz, elementFunction); + + if (propertyDescriptor != null) { + functionNames.add(propertyDescriptor.getReadMethod() + .getName() + + "()"); + System.out.println("Property " + elementFunction + + " mapped to function : " + + propertyDescriptor.getReadMethod().getName()); + lastClassName = propertyDescriptor.getPropertyType() + .getName(); + } else { + System.out.println("Property " + elementFunction + + " not found in class : " + lastClassName); + throw new CompilationException(); + } + } + + } catch (Throwable e) { + + System.out.println("Error load class : " + lastClassName + ", " + + e.getLocalizedMessage()); + e.printStackTrace(); + throw new CompilationException("Error load class : " + + lastClassName, e); + } + + } + + StringBuffer tmpbuf = new StringBuffer(); + for (Iterator iter = functionNames.iterator(); iter.hasNext();) { + String tmpElement = (String) iter.next(); + if (tmpbuf.length() != 0) { + tmpbuf.append("."); + } + tmpbuf.append(tmpElement); + } + this.fullFunctionName = tmpbuf.toString(); + + } + + /** + * + * @param clazz + * @param propertyName + * @return + */ + private PropertyDescriptor getPropertyDescriptor(Class clazz, + String propertyName) { + PropertyDescriptor returnValue = null; + + PropertyDescriptor[] propertyDescriptors = PropertyUtils + .getPropertyDescriptors(clazz); + + for (int i = 0; i < propertyDescriptors.length; i++) { + PropertyDescriptor descriptor = propertyDescriptors[i]; + if (descriptor.getName().equals(propertyName)) { + returnValue = descriptor; + break; + } + } + + return returnValue; + } + + /** + * + * @param clazz + * @param propertyName + * @return + */ + private String getMethod(Class clazz, String methodName) + throws ClassNotFoundException { + String returnValue = null; + + Class[][] arrayParametersTypes = null; + if (this.useOnlyEnumeratingParaments) { + arrayParametersTypes = new Class[1][this.parameters.size()]; + for (int i = 0; i < this.parameters.size(); i++) { + arrayParametersTypes[0][i] = ((Parameter) this.parameters + .get(i)).getType(); + } + + } else { + + arrayParametersTypes = new Class[PARAM_NAMES.length + 1][]; + + for (int i = 0; i < arrayParametersTypes.length; i++) { + int addlength = 0; + if (i < PARAM_NAMES.length) { + addlength = PARAM_NAMES[i].length; + } + + arrayParametersTypes[i] = new Class[addlength + + this.parameters.size()]; + } + + for (int i = 0; i < PARAM_NAMES.length; i++) { + for (int j = 0; j < PARAM_NAMES[i].length; j++) { + arrayParametersTypes[i][j] = this.getComponentBean() + .getVariableType(PARAM_NAMES[i][j]); + } + } + + for (int i = 0; i < arrayParametersTypes.length; i++) { + int shift = 0; + if (i < PARAM_NAMES.length) { + shift = PARAM_NAMES[i].length; + } + + for (int j = 0; j < this.parameters.size(); j++) { + Parameter parameter = (Parameter) this.parameters.get(j); + arrayParametersTypes[i][shift + j] = parameter.getType(); + } + } + + } + + for (int i = 0; i < arrayParametersTypes.length; i++) { + if (null != this.getComponentBean().getMethodReturnedClass(clazz, methodName, + arrayParametersTypes[i])) { + StringBuffer buffer = new StringBuffer(); + + buffer.append(methodName); + buffer.append("("); + + int shift = 0; + if (i < PARAM_NAMES.length) { + shift = PARAM_NAMES[i].length; + } + + for (int j = 0; j < arrayParametersTypes[i].length; j++) { + if (j > 0) { + buffer.append(", "); + } + if ((i < PARAM_NAMES.length) && (j < PARAM_NAMES[i].length)) { + buffer.append(PARAM_NAMES[i][j]); + } else { + Parameter parameter = (Parameter) this.parameters.get(j + - shift); + String tmp = ELParser.compileEL(parameter.getValue(), + this.getComponentBean()); + buffer.append(tmp); + } + } + buffer.append(")"); + returnValue = buffer.toString(); + break; + } + } // for + + return returnValue; + } + + /** + * @throws CompilationException + * + */ + public String getBeginElement() throws CompilationException { + + VelocityContext context = new VelocityContext(); + context.put("variableName", this.variable); + context.put("function", this.fullFunctionName); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + /** + * + */ + public String getEndElement() { + return null; + } +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FClientIDTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,81 @@ +/** + * 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.templatecompiler.elements.vcp; + +import java.util.Formatter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:cliendId-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.2 $ $Date: 2007/02/21 17:16:20 $ + */ +public class FClientIDTemplateElement extends TemplateElementBase { + private String strThisVariable; + + private Class type; + + public FClientIDTemplateElement(final Node element, + final CompilationContext componentBean) { + super(element, componentBean); + NamedNodeMap nnm = element.getAttributes(); + String sVariableName = nnm.getNamedItem("var").getNodeValue(); + + this.strThisVariable = sVariableName; + + Class[] parameters = new Class[1]; + parameters[0] = componentBean.getVariableType("context"); + + this.type = componentBean.getMethodReturnedClass(componentBean + .getVariableType("component"), "getClientId", parameters); + + componentBean.addVariable(this.strThisVariable, this.type); + } + + public String getBeginElement() { + String sReturnValue; + + // Object[] objects = new Object[1]; + // objects[0] = strThisVariable; + + // sReturnValue = new Formatter(). + // format( + // "variables.setVariable(\"%s\",component.getClientId(context));", + // objects).toString(); + Object[] objects = new Object[2]; + objects[0] = this.type.getName(); + objects[1] = this.strThisVariable; + sReturnValue = new Formatter().format( + "%s %s = component.getClientId(context);", objects).toString(); + return sReturnValue; + } + + public String getEndElement() { + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FInsertChildren.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,90 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:insertChildren-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:48 $ + */ +public class FInsertChildren extends TemplateElementBase { + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/insertChildren.vm"; + + private static int numberOfIndex = 0; + + private String indexExpression; + + private String varExpression; + + + public FInsertChildren(Node element, final CompilationContext componentBean) { + super(element, componentBean); + NamedNodeMap nnm = element.getAttributes(); + Node value = nnm.getNamedItem("index"); + + this.indexExpression = null; + this.varExpression = null; + + if (value != null) { + this.indexExpression = value.getNodeValue(); + } else { + value = nnm.getNamedItem("var"); + if (value != null) { + this.varExpression = value.getNodeValue(); + } // if + } // if + + } + + public String getBeginElement() throws CompilationException { + numberOfIndex++; + + VelocityContext context = new VelocityContext(); + + context.put("indexChildren", new Integer(numberOfIndex)); + context.put("ELIndex", this.indexExpression); + context.put("ELVar", this.varExpression); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/FResourceTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,90 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:resource-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/26 20:48:48 $ + */ +public class FResourceTemplateElement extends TemplateElementBase { + private final static String VAR_ATTRIBUTE_NAME = "var"; + + private final static String NAME_ATTRIBUTE_NAME = "name"; + + private String name; + + private String variable; + + public FResourceTemplateElement(Node element, + final CompilationContext componentBean) { + super(element, componentBean); + NamedNodeMap nnm = element.getAttributes(); + + Node classNode = nnm.getNamedItem(NAME_ATTRIBUTE_NAME); + Node variableNode = nnm.getNamedItem(VAR_ATTRIBUTE_NAME); + + if (classNode != null) { + this.name = classNode.getNodeValue(); + } + + if (variableNode != null) { + this.variable = variableNode.getNodeValue(); + } + + } + + public String getBeginElement() throws CompilationException { + VelocityContext context = new VelocityContext(); + context.put("variable", this.variable); + context.put("resourceURI", this.name); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/insertResource.vm"; + } + + public String getEndElement() { + return null; + } + + public String getName() { + return name; + } + + public String getVariable() { + return variable; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,151 @@ +/** + * 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.templatecompiler.elements.vcp; + +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.Node; + +/** + * @author Maksim Kaszynski Utility element for HeaderResourceRenderer-based + * templates Creates getXxx() methods with values set within it body + * + * Example <code> + * <h:styles>/org/ajax4jsf/resource/style.css,/org/ajax4jsf/resource/style2.css</h:styles> + * </code> + * results in <br> + * <code> + * private final InternetResource[] styles = { + * getResource("/org/ajax4jsf/resource/style.css"), + * getResource(/org/ajax4jsf/resource/style2.css") + * }; + * + * protected InternetResource [] getStyles() { + * return styles; + * } + * </code> + */ +public abstract class HeaderResourceElement extends TemplateElementBase { + + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/headerResource.vm"; + + private static final String NEW = "new "; + + private String[] keys; + + private String[] resourcePaths; + + public HeaderResourceElement(Node element, CompilationContext componentBean) + throws CompilationException { + super(element, componentBean); + String resourcesAsString = element.getTextContent(); + if (resourcesAsString != null) { + StringTokenizer tokenizer = new StringTokenizer(resourcesAsString, + "\r\n\t,;"); + List paths = new ArrayList(tokenizer.countTokens()); + List keyz = new ArrayList(tokenizer.countTokens()); + while (tokenizer.hasMoreTokens()) { + String token = tokenizer.nextToken(); + String path; + + if (token.startsWith(NEW)) { + keyz.add(token); + int idx = token.indexOf('('); + if (idx != -1) { + path = token.substring(0, idx).substring(NEW.length()).trim(); + } else { + path = token.substring(NEW.length()).trim(); + } + } else { + keyz.add("getResource(\"" + token + "\")"); + path = token; + } + + paths.add(path); + } + this.keys = (String[]) keyz.toArray(new String[keyz.size()]); + this.resourcePaths = (String[]) paths.toArray(new String[paths.size()]); + } + componentBean + .addToImport("org.ajax4jsf.framework.resource.InternetResource"); + componentBean.addToDeclaration(getContent()); + } + + private String getterMethodName(String propName) { + return "get" + Character.toUpperCase(propName.charAt(0)) + + propName.substring(1); + } + + protected String getGetterModifier() { + return "protected"; + } + + protected abstract String getPropertyName(); + + public String getBeginElement() { + // TODO Auto-generated method stub + return null; + } + + private String getContent() throws CompilationException { + VelocityContext context = new VelocityContext(); + String propertyName = getPropertyName(); + + if (this.keys != null) { + context.put("resourceKeys", this.keys); + } + + context.put("propertyGetterName", getterMethodName(propertyName)); + context.put("property", propertyName); + context.put("getterModifier", getGetterModifier()); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + // TODO Auto-generated method stub + return null; + } + + public boolean isSkipBody() { + // TODO Auto-generated method stub + return true; + } + + public String[] getResourcePaths() { + return resourcePaths; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderScriptsElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,52 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.Node; + +/** + * @author Maksim Kaszynski + * + */ +public class HeaderScriptsElement extends HeaderResourceElement { + + /** + * @param element + * @param componentBean + * @throws CompilationException + */ + public HeaderScriptsElement(Node element, CompilationContext componentBean) throws CompilationException { + super(element, componentBean); + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.templatecompiler.elements.vcp.HeaderResourceElement#getPropertyName() + */ + protected String getPropertyName() { + return "scripts"; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderStylesElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,42 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.Node; + +/** + * @author Maksim Kaszynski + * + */ +public class HeaderStylesElement extends HeaderResourceElement { + + public HeaderStylesElement(Node element, CompilationContext componentBean) throws CompilationException { + super(element, componentBean); + } + + protected String getPropertyName() { + return "styles"; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/InsertComponent.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,89 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.el.ELParser; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:insertComponent-tag. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:47 $ + */ +public class InsertComponent extends TemplateElementBase { + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/insertComponent.vm"; + + private static int numberOfIndex = 0; + + private String indexExpression; + + private String valueExpression; + + public InsertComponent(Node element, final CompilationContext componentBean) { + super(element, componentBean); + NamedNodeMap nnm = element.getAttributes(); + Node value = nnm.getNamedItem("index"); + + this.indexExpression = null; + this.valueExpression = null; + + if (value != null) { + this.indexExpression = value.getNodeValue(); + } else { + value = nnm.getNamedItem("value"); + this.valueExpression = ELParser.compileEL(value.getNodeValue(), + componentBean); + } // if + + } + + public String getBeginElement() throws CompilationException { + numberOfIndex++; + + VelocityContext context = new VelocityContext(); + + // context.put("indexChildren", new Integer(numberOfIndex)); + // context.put("ELIndex", indexExpression); + context.put("value", this.valueExpression); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/Parameter.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,75 @@ +/** + * 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.templatecompiler.elements.vcp; + +/** + * container class for storing information about f:parameter-tags. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:26 $ + */ +public class Parameter { + private String value; + + private Class type; + + /** + * + * @param value + * @param type + */ + public Parameter(final String value) { + this(value, String.class); + } + + /** + * + * @param value + * @param type + */ + public Parameter(final String value, final Class type) { + this.value = value; + this.type = type; + } + + /** + * + * @return + */ + public Class getType() { + + return this.type; + } + + /** + * + * @return + */ + public String getValue() { + return this.value; + } + + public String toString() { + return "\n\tvalue: " + this.value + "\n\ttype: " + this.type; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/ParameterProcessor.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,94 @@ +/** + * 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.templatecompiler.elements.vcp; + +import java.util.ArrayList; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Processing f:parameter-tags. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: + * alexeyyukhovich $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:47 $ + */ +public class ParameterProcessor { + private final static String PARAMETER_NODE_NAME = "f:parameter"; + + private final static String PARAMETER_NODE_VALUE = "value"; + + private final static String PARAMETER_NODE_TYPE = "type"; + + private ArrayList arrayParameters = new ArrayList(); + + public ParameterProcessor(final Node element, CompilationContext componentBean) + throws CompilationException { + NodeList childNodes = element.getChildNodes(); + if (childNodes != null) { + for (int iElement = 0; iElement < childNodes.getLength(); iElement++) { + Node childNode = childNodes.item(iElement); + if ((childNode.getNodeType() == Node.ELEMENT_NODE) + && (childNode.getNodeName().equals(PARAMETER_NODE_NAME))) { + + element.removeChild(childNode); + + NamedNodeMap attributes = childNode.getAttributes(); + + if (attributes != null) { + Node nodeValue = attributes + .getNamedItem(PARAMETER_NODE_VALUE); + Node nodeType = attributes + .getNamedItem(PARAMETER_NODE_TYPE); + + if (nodeValue != null) { + Parameter param = null; + + if (null != nodeType) { + Class parameterType; + try { + parameterType = componentBean + .loadClass(nodeType.getNodeValue()); + } catch (ClassNotFoundException e) { + throw new CompilationException(); + } + param = new Parameter(nodeValue.getNodeValue(), + parameterType); + } else { + param = new Parameter(nodeValue.getNodeValue()); + } + this.arrayParameters.add(param); + } + } + } + } + } + } + + public ArrayList getParameters() { + return this.arrayParameters; + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/UInsertFacetTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,77 @@ +/** + * 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.templatecompiler.elements.vcp; + +import java.io.StringWriter; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.builder.CompilationException; +import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.apache.velocity.VelocityContext; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * Processing f:insertFacet-tags. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.4 $ $Date: 2007/02/26 20:48:48 $ + */ +public class UInsertFacetTemplateElement extends TemplateElementBase { + private static int numberOfFaced = 0; + + private String nameOfElement; + + private static final String TEMPLATE = A4JRendererElementsFactory.TEMPLATES_TEMPLATECOMPILER_PATH+"/insertFacet.vm"; + + public UInsertFacetTemplateElement(Node element, + final CompilationContext componentBean) { + super(element, componentBean); + + NamedNodeMap nnm = element.getAttributes(); + Node value = nnm.getNamedItem("name"); + this.nameOfElement = value.getNodeValue(); + } + + public String getBeginElement() throws CompilationException { + + numberOfFaced++; + + VelocityContext context = new VelocityContext(); + StringWriter strW = new StringWriter(); + context.put("index", new Integer(numberOfFaced)); + context.put("FacetName", this.nameOfElement); + return this.getComponentBean().processTemplate(getTemplateName(), context); + } + + /** + * @return + */ + protected String getTemplateName() { + return TEMPLATE; + } + + public String getEndElement() { + return null; + } +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/VcpBodyTemplateElement.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,50 @@ +/** + * 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.templatecompiler.elements.vcp; + +import org.ajax4jsf.templatecompiler.builder.CompilationContext; +import org.ajax4jsf.templatecompiler.elements.BodyElement; +import org.ajax4jsf.templatecompiler.elements.TemplateElementBase; +import org.w3c.dom.Node; + +/** + * Processing vcp:body-tags. + * + * @author ayukhovich(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.3 $ $Date: 2007/02/26 20:48:46 $ + */ +public class VcpBodyTemplateElement extends TemplateElementBase implements BodyElement { + public final static String STR_VCB_BODY = "VCPBODY"; + + public VcpBodyTemplateElement(Node element, + final CompilationContext componentBean) { + super(element, componentBean); + } + + public String getBeginElement() { + return STR_VCB_BODY; + } + + public String getEndElement() { + return STR_VCB_BODY; + } +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/CallbackListener.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,59 @@ +/** + * 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.templatecompiler.utils; + +/* + * Copyright 2004-2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @author Martin Marinschek + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:39 $ <p/> $Log: + * CallbackListener.java,v $ Revision 1.1 2006/07/05 08:53:39 + * alexsmirnov Refactor filter system ( move different functions for + * different classes ). Fix encoding for AJAX responses - forced to + * UTF-8 Fix issue #5 from tracker Fix error message for xml parsing. + * + */ +public interface CallbackListener { + void openedStartTag(int charIndex, int tagIdentifier); + + void closedStartTag(int charIndex, int tagIdentifier); + + void openedEndTag(int charIndex, int tagIdentifier); + + void closedEndTag(int charIndex, int tagIdentifier); + + void attribute(int charIndex, int tagIdentifier, String key, String value); +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/utils/ReducedHTMLParser.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,624 @@ +/** + * 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.templatecompiler.utils; + +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A class which detects the open/close tags in an HTML document and reports + * them to a listener class. + * <p> + * This is unfortunately necessary when using JSF with JSP, as tags in the body + * of the document can need to output commands into the document at points + * earlier than the tag occurred (particularly into the document HEAD section). + * This can only be implemented by buffering the response and post-processing it + * to find the relevant HTML tags and modifying the buffer as needed. + * <p> + * This class tries to do the parsing as quickly as possible; many of the + * details of HTML are not relevant for the purposes this class is used for. + * + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:39 $ + */ +public class ReducedHTMLParser { + // IMPLEMENTATION NOTE: + // + // Many of the methods on this class are package-scope. This is intended + // solely for the purpose of unit-testing. This class does not expect + // other classes in this package to access its methods. + + private static final Log log = LogFactory.getLog(ReducedHTMLParser.class); + + public static final int BODY_TAG = 0; + + public static final int HEAD_TAG = 1; + + public static final int SCRIPT_TAG = 2; + + private static final int STATE_READY = 0; + + private static final int STATE_IN_COMMENT = 1; + + private static final int STATE_IN_TAG = 2; + + private static final int STATE_IN_MARKED_SECTION = 3; + + private static final int STATE_EXPECTING_ETAGO = 4; + + private int _offset; + + private int _lineNumber; + + private CharSequence _seq; + + private CallbackListener _listener; + + public static void parse(CharSequence seq, CallbackListener l) { + new ReducedHTMLParser(seq, l).parse(); + } + + /** + * Constructor, package-scope for unit testing. + * + * @param s + * is the sequence of chars to parse. + * @param l + * is the listener to invoke callbacks on. + */ + ReducedHTMLParser(CharSequence s, CallbackListener l) { + this._seq = s; + this._listener = l; + } + + /** + * Return true if there are no more characters to parse. + */ + boolean isFinished() { + return this._offset >= this._seq.length(); + } + + int getCurrentLineNumber() { + return this._lineNumber; + } + + /** + * Advance the current parse position over any whitespace characters. + */ + void consumeWhitespace() { + boolean crSeen = false; + + while (this._offset < this._seq.length()) { + char c = this._seq.charAt(this._offset); + if (!Character.isWhitespace(c)) { + break; + } + + // Track line number for error messages. + if (c == '\r') { + ++this._lineNumber; + crSeen = true; + } else if ((c == '\n') && !crSeen) { + ++this._lineNumber; + } else { + crSeen = false; + } + + ++this._offset; + } + } + + /** + * Eat up a sequence of non-whitespace characters and return them. + */ + String consumeNonWhitespace() { + int wordStart = this._offset; + while (this._offset < this._seq.length()) { + char c = this._seq.charAt(this._offset); + if (Character.isWhitespace(c)) { + break; + } + ++this._offset; + } + if (wordStart == this._offset) { + return null; + } else { + return this._seq.subSequence(wordStart, this._offset).toString(); + } + } + + /** + * If the next chars in the input sequence exactly match the specified + * string then skip over them and return true. + * <p> + * If there is not a match then leave the current parse position unchanged + * and return false. + * + * @param s + * is the exact string to match. + * @return true if the input contains exactly the param s + */ + boolean consumeMatch(String s) { + if (this._offset + s.length() > this._seq.length()) { + // seq isn't long enough to contain the specified string + return false; + } + + int i = 0; + while (i < s.length()) { + if (this._seq.charAt(this._offset + i) == s.charAt(i)) { + ++i; + } else { + return false; + } + } + + this._offset += i; + return true; + } + + /** + * Eat up a sequence of chars which form a valid XML element name. + * <p> + * TODO: implement this properly in compliance with spec + */ + String consumeElementName() { + consumeWhitespace(); + int nameStart = this._offset; + while (!isFinished()) { + boolean ok = false; + char c = this._seq.charAt(this._offset); + if (Character.isLetterOrDigit(this._seq.charAt(this._offset))) { + ok = true; + } else if (c == '_') { + ok = true; + } else if (c == '-') { + ok = true; + } else if (c == ':') { + ok = true; + } + + if (!ok) { + break; + } + + ++this._offset; + } + + if (nameStart == this._offset) { + return null; + } else { + return this._seq.subSequence(nameStart, this._offset).toString(); + } + } + + /** + * Eat up a sequence of chars which form a valid XML attribute name. + * <p> + * TODO: implement this properly in compliance with spec + */ + String consumeAttrName() { + // for now, assume elements and attributes have same rules + return consumeElementName(); + } + + /** + * Eat up a string which is terminated with the specified quote character. + * This means handling escaped quote chars within the string. + * <p> + * This method assumes that the leading quote has already been consumed. + */ + String consumeString(char quote) { + // TODO: should we consider a string to be terminated by a newline? + // that would help with runaway strings but I think that multiline + // strings *are* allowed... + // + // TODO: detect newlines within strings and increment lineNumber. + // This isn't so important, though; they aren't common and being a + // few lines out in an error message isn't serious either. + StringBuffer stringBuf = new StringBuffer(); + boolean escaping = false; + while (!isFinished()) { + char c = this._seq.charAt(this._offset); + ++this._offset; + if (c == quote) { + if (!escaping) { + break; + } else { + stringBuf.append(c); + escaping = false; + } + } else if (c == '\\') { + if (escaping) { + // append a real backslash + stringBuf.append(c); + escaping = false; + } else { + escaping = true; + } + } else { + stringBuf.append(c); + } + } + return stringBuf.toString(); + } + + /** + * Assuming we have already encountered "attrname=", consume the value part + * of the attribute definition. Note that unlike XML, HTML doesn't have to + * quote its attribute values. + * + * @return the attribute value. If the attr-value was quoted, the returned + * value will not include the quote chars. + */ + String consumeAttrValue() { + consumeWhitespace(); + if (consumeMatch("'")) { + return consumeString('\''); + } else if (consumeMatch("\"")) { + return consumeString('"'); + } else { + return consumeNonWhitespace(); + } + } + + /** + * Discard all characters in the input until one in the specified string + * (character-set) is found. + * + * @param s + * is a set of characters that should not be discarded. + */ + void consumeExcept(String s) { + boolean crSeen = false; + + while (this._offset < this._seq.length()) { + char c = this._seq.charAt(this._offset); + if (s.indexOf(c) >= 0) { + // char is in the exception set + return; + } + + // Track line number for error messages. + if (c == '\r') { + ++this._lineNumber; + crSeen = true; + } else if ((c == '\n') && !crSeen) { + ++this._lineNumber; + } else { + crSeen = false; + } + + // Track line number for error messages. + if (c == '\r') { + ++this._lineNumber; + crSeen = true; + } else if ((c == '\n') && !crSeen) { + ++this._lineNumber; + } else { + crSeen = false; + } + + ++this._offset; + } + } + + /** + * Process the entire input buffer, invoking callbacks on the listener + * object as appropriate. + */ + void parse() { + int state = STATE_READY; + + int currentTagStart = -1; + String currentTagName = null; + + this._lineNumber = 1; + this._offset = 0; + int lastOffset = this._offset - 1; + while (this._offset < this._seq.length()) { + // Sanity check; each pass through this loop must increase the + // offset. + // Failure to do this means a hang situation has occurred. + if (this._offset <= lastOffset) { + // throw new RuntimeException("Infinite loop detected in + // ReducedHTMLParser"); + log + .error("Infinite loop detected in ReducedHTMLParser; parsing skipped"); + // return; + } + lastOffset = this._offset; + + if (state == STATE_READY) { + // in this state, nothing but "<" has any significance + consumeExcept("<"); + if (isFinished()) { + break; + } + + if (consumeMatch("")) { + state = STATE_READY; + } else { + // false call; hyphen is not end of comment + consumeMatch("-"); + } + + continue; + } + + if (state == STATE_IN_TAG) { + consumeWhitespace(); + + if (consumeMatch("/>")) { + // ok, end of element + state = STATE_READY; + closedTag(currentTagStart, this._offset, currentTagName); + + // and reset vars just in case... + currentTagStart = -1; + currentTagName = null; + } else if (consumeMatch(">")) { + if (currentTagName.equalsIgnoreCase("script") + || currentTagName.equalsIgnoreCase("style")) { + // We've just started a special tag which can contain + // anything except + // the ETAGO marker ("</"). See + // http://www.w3.org/TR/REC-html40/appendix/notes.html#notes-specifying-data + state = STATE_EXPECTING_ETAGO; + } else { + state = STATE_READY; + } + + // end of open tag, but not end of element + openedTag(currentTagStart, this._offset, currentTagName); + + // and reset vars just in case... + currentTagStart = -1; + currentTagName = null; + } else { + // xml attribute + String attrName = consumeAttrName(); + if (attrName == null) { + // Oops, we found something quite unexpected in this + // tag. + // The best we can do is probably to drop back to + // looking + // for "/>", though that does risk us misinterpreting + // the + // contents of an attribute's associated string value. + log + .warn("Invalid tag found: unexpected input while looking for attr name or '/>'" + + " at line " + getCurrentLineNumber()); + state = STATE_EXPECTING_ETAGO; + // and consume one character + ++this._offset; + } else { + consumeWhitespace(); + + // html can have "stand-alone" attributes with no + // following equals sign + if (consumeMatch("=")) { + String attrValue = consumeAttrValue(); + } + } + } + + continue; + } + + if (state == STATE_IN_MARKED_SECTION) { + // in this state, nothing but "]]>" has any significance + consumeExcept("]"); + if (isFinished()) { + break; + } + + if (consumeMatch("]]>")) { + state = STATE_READY; + } else { + // false call; ] is not end of cdata section + consumeMatch("]"); + } + + continue; + } + + if (state == STATE_EXPECTING_ETAGO) { + // The term "ETAGO" is the official spec term for "</". + consumeExcept("<"); + if (isFinished()) { + log + .debug("Malformed input page; input terminated while tag not closed."); + break; + } + + if (consumeMatch("</")) { + if (!processEndTag()) { + return; + } + state = STATE_READY; + } else { + // false call; < does not start an ETAGO + consumeMatch("<"); + } + + continue; + } + } + } + + /** + * Invoked when "</" has been seen in the input, this method handles the + * parsing of the end tag and the invocation of the appropriate callback + * method. + * + * @return true if the tag was successfully parsed, and false if there was a + * fatal parsing error. + */ + private boolean processEndTag() { + int tagStart = this._offset - 2; + String tagName = consumeElementName(); + consumeWhitespace(); + if (!consumeMatch(">")) { + log.error("Malformed end tag at line " + getCurrentLineNumber() + + "; skipping parsing"); + return false; + } + + // inform user that the tag has been closed + closedTag(tagStart, this._offset, tagName); + + // We can't verify that the tag names balance because this is HTML + // we are processing, not XML. + return true; + } + + /** + * Invoke a callback method to inform the listener that we have found a + * start tag. + * + * @param startOffset + * @param endOffset + * @param tagName + */ + void openedTag(int startOffset, int endOffset, String tagName) { + // log.debug("Found open tag at " + startOffset + ":" + endOffset + ":" + // + tagName); + + if ("head".equalsIgnoreCase(tagName)) { + this._listener.openedStartTag(startOffset, HEAD_TAG); + this._listener.closedStartTag(endOffset, HEAD_TAG); + } else if ("body".equalsIgnoreCase(tagName)) { + this._listener.openedStartTag(startOffset, BODY_TAG); + this._listener.closedStartTag(endOffset, BODY_TAG); + } else if ("script".equalsIgnoreCase(tagName)) { + this._listener.openedStartTag(startOffset, SCRIPT_TAG); + this._listener.closedStartTag(endOffset, SCRIPT_TAG); + } + } + + void closedTag(int startOffset, int endOffset, String tagName) { + // log.debug("Found close tag at " + startOffset + ":" + endOffset + ":" + // + tagName); + + if ("head".equalsIgnoreCase(tagName)) { + this._listener.openedEndTag(startOffset, HEAD_TAG); + this._listener.closedEndTag(endOffset, HEAD_TAG); + } else if ("body".equalsIgnoreCase(tagName)) { + this._listener.openedEndTag(startOffset, BODY_TAG); + this._listener.closedEndTag(endOffset, BODY_TAG); + } else if ("script".equalsIgnoreCase(tagName)) { + this._listener.openedEndTag(startOffset, SCRIPT_TAG); + this._listener.closedEndTag(endOffset, SCRIPT_TAG); + } + } +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/AntFileResourceLoader.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,118 @@ +/** + * 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.templatecompiler.velocity; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; + +import org.apache.commons.collections.ExtendedProperties; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.resource.Resource; +import org.apache.velocity.runtime.resource.loader.ResourceLoader; + +/** + * Load resource from file, name prepared by Ant + * + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:34 $ + * + */ +public class AntFileResourceLoader extends ResourceLoader { + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#init(org.apache.commons.collections.ExtendedProperties) + */ + public void init(ExtendedProperties arg0) { + this.rsvc.info("AntFileResourceLoader : initialization starting."); + this.rsvc.info("AntFileResourceLoader : initialization complete."); + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream(java.lang.String) + */ + public InputStream getResourceStream(String templateName) + throws ResourceNotFoundException { + /* + * Make sure we have a valid templateName. + */ + if ((templateName == null) || (templateName.length() == 0)) { + /* + * If we don't get a properly formed templateName then there's not + * much we can do. So we'll forget about trying to search any more + * paths for the template. + */ + throw new ResourceNotFoundException( + "Need to specify a file name or file path!"); + } + try { + this.rsvc.info("AntFileResourceLoader : attempt to load file " + + templateName); + File file = new File(templateName); + + if (file.canRead()) { + return new BufferedInputStream(new FileInputStream(file + .getAbsolutePath())); + } else { + String msg = "AntFileResourceLoader Error: can not read file " + + templateName; + + throw new ResourceNotFoundException(msg); + } + } catch (FileNotFoundException fnfe) { + /* + * log and convert to a general Velocity ResourceNotFoundException + */ + String msg = "AntFileResourceLoader Error: file not found " + + templateName; + + throw new ResourceNotFoundException(msg); + } + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#isSourceModified(org.apache.velocity.runtime.resource.Resource) + */ + public boolean isSourceModified(Resource arg0) { + // TODO Auto-generated method stub + return false; + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getLastModified(org.apache.velocity.runtime.resource.Resource) + */ + public long getLastModified(Resource arg0) { + // TODO Auto-generated method stub + return 0; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/BuilderContext.java =================================================================== --- branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/BuilderContext.java (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/velocity/BuilderContext.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,89 @@ +/** + * 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.templatecompiler.velocity; + +import org.apache.velocity.context.AbstractContext; + +/** + * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2006/12/20 18:56:33 $ + * + */ +public class BuilderContext extends AbstractContext { + + /** + * + */ + private static final long serialVersionUID = -2717339663835966811L; + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.context.AbstractContext#internalGet(java.lang.String) + */ + public Object internalGet(String arg0) { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.context.AbstractContext#internalPut(java.lang.String, + * java.lang.Object) + */ + public Object internalPut(String arg0, Object arg1) { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.context.AbstractContext#internalContainsKey(java.lang.Object) + */ + public boolean internalContainsKey(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.context.AbstractContext#internalGetKeys() + */ + public Object[] internalGetKeys() { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.apache.velocity.context.AbstractContext#internalRemove(java.lang.Object) + */ + public Object internalRemove(Object arg0) { + // TODO Auto-generated method stub + return null; + } + +} Added: branches/refactor1/cdk/generator/src/main/java/readme.txt =================================================================== --- branches/refactor1/cdk/generator/src/main/java/readme.txt (rev 0) +++ branches/refactor1/cdk/generator/src/main/java/readme.txt 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1 @@ +Component development kit \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/plexus/components.xml =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/plexus/components.xml (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/plexus/components.xml 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,18 @@ +<component-set> + <components> + <component> + <role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role> + <role-hint>a4j</role-hint> + <implementation> + org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory + </implementation> + </component> + <component> + <role>org.ajax4jsf.templatecompiler.elements.ElementsFactory</role> + <role-hint>jstl</role-hint> + <implementation> + org.ajax4jsf.templatecompiler.elements.JSTLElementsFactory + </implementation> + </component> + </components> +</component-set> \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/VM_global_library.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/VM_global_library.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/VM_global_library.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,12 @@ +#macro( quietnull $a) + +#if($a)$a#end + +#end + + + + + + + Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,109 @@ +/** + * 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 + */ + +#if($component.packageName) +package $component.packageName; +#end + +#if($component.imports) + +// +// Imports +// +#foreach( $import in $component.imports ) +import $import; +#end +// +// +// + +#else +import java.util.Iterator; +import java.util.Collection; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; +import org.ajax4jsf.framework.renderer.ComponentVariables; +#end + +#if($component.fullBaseclass) +import $component.fullBaseclass; +#else +import org.ajax4jsf.framework.renderer.RendererBase; +#end + +#if($component.baseclassName) +#set( $baseclassname = $component.baseclassName ) +#else +#set( $baseclassname = "RendererBase" ) +#end + + +/** + * Renderer for component class ${component.fullClassName} + */ +public class $component.className extends $baseclassname { + + public $component.className () { + super(); + } + +#if( $component.declarations ) + // + // Declarations + // +#foreach( $declaration in $component.declarations ) + $declaration +#end + // + // + // +#end + + + private String convertToString(Object obj ) { + return ( obj == null ? "" : obj.toString() ); + } + private String convertToString(boolean b ) { + return String.valueOf(b); + } + private String convertToString(int b ) { + return b!=Integer.MIN_VALUE?String.valueOf(b):""; + } + private String convertToString(long b ) { + return b!=Long.MIN_VALUE?String.valueOf(b):""; + } + + /** + * Get base component class, targetted for this renderer. Used for check arguments in decode/encode. + * @return + */ + protected Class getComponentClass() { +#if($component.componentClass) + return ${component.componentClass}.class; +#else + return UIComponent.class; +#end + } Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeBegin.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeBegin.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeBegin.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,10 @@ + + public void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component ) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeBegin(writer, context, (${component.componentClass})component, variables ); + } + + public void doEncodeBegin(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables ) throws IOException { + $body + } + \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeChildren.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeChildren.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeChildren.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,16 @@ + + public void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeChildren(writer, context, (${component.componentClass})component, variables ); + } + + public void doEncodeChildren(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException { + ${body} + } + + /* (non-Javadoc) + * @see javax.faces.render.Renderer#getRendersChildren() + */ + public boolean getRendersChildren() { + return true; + } Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeEnd.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeEnd.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/EncodeEnd.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,12 @@ + + public void doEncodeEnd(ResponseWriter writer, FacesContext context, ${component.componentClass} component, ComponentVariables variables) throws IOException { + ${body} + } + + public void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); + doEncodeEnd(writer, context, (${component.componentClass})component, variables ); + + ComponentsVariableResolver.removeVariables(this, component); + } + Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_1.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_1.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_1.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,3 @@ +Collection com_$index = (Collection)$items; +for (Iterator iter = com_$index .iterator(); iter.hasNext();) { + variables.setVariable("$item", iter.next()); \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/FORElement_2.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,5 @@ +for ( + variables.setVariable("$item", $from); + Integer.getInteger(variables.getVariable("$item").toString()).intValue() < Integer.getInteger($to).toString()).intValue(); + variables.addValueToVariable("$item", new Integer(1) ) + ) { \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/HTMLElement.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/HTMLElement.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/HTMLElement.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,32 @@ +writer.startElement("$htmlTag", component); +#if($htmlAttributes) +#foreach( $key in $htmlAttributes.keySet() ) + #set ( $attr = $htmlAttributes.get($key) ) + #if ( $attr.code ) + $attr.code + #else + #if ( $attr.value ) +getUtils().writeAttribute(writer, "$attr.name", $attr.value ); + #end + #end +#end +#end +#if($passThruAttributes) +// +// pass thru attributes +// +#set( $passThruLength = ${passThruAttributes.size()}) +getUtils().encodeAttributesFromArray(context,component,new String[] { +#foreach( $attribute in $passThruAttributes ) + "$attribute" #if( $velocityCount < $passThruLength ), + #end +#end +}); +// +// +// +#end +#if($htmlText) +writer.write( convertToString($htmlText) ); +writer.flush(); +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/IFElement.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/IFElement.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/IFElement.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,2 @@ +if ( Boolean.valueOf( String.valueOf($if) ).booleanValue() ) { + Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/headerResource.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/headerResource.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/headerResource.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,48 @@ +private final InternetResource[] ${property} = { + #set ($count = 0) + #foreach($resource in $resourceKeys) + #if($count > 0) + , + #end + #set ($count = $count + 1) + ${resource} + #end +}; + +private InternetResource[] ${property}All = null; + +${getterModifier} InternetResource[] ${propertyGetterName}() { + synchronized (this) { + if (${property}All == null) { + InternetResource[] rsrcs = super.${propertyGetterName}(); + boolean ignoreSuper = rsrcs == null || rsrcs.length == 0; + boolean ignoreThis = ${property} == null || ${property}.length == 0; + + if (ignoreSuper) { + if (ignoreThis) { + ${property}All = new InternetResource[0]; + } else { + ${property}All = ${property}; + } + } else { + if (ignoreThis) { + ${property}All = rsrcs; + } else { + java.util.Set rsrcsSet = new java.util.LinkedHashSet(); + + for (int i = 0; i < rsrcs.length; i++ ) { + rsrcsSet.add(rsrcs[i]); + } + + for (int i = 0; i < ${property}.length; i++ ) { + rsrcsSet.add(${property}[i]); + } + + ${property}All = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]); + } + } + } + } + + return ${property}All; +} \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertCall.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertCall.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertCall.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,5 @@ +#if ($variableName) +variables.setVariable("$variableName", $function); +#else +$function; +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertChildren.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertChildren.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertChildren.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,12 @@ +#if(${$ELIndex} || ${$ELVar}) +#if(${$ELIndex}) +Integer indexChildren_$indexChildren = (Integer)ComponentUtils.evaluateExpression(facesContext, "$ELIndex"); +if (null != indexChildren_$indexChildren ) { + UIComponent component_$indexChildren = (UIComponent)component.getChildren().get(indexChildren_$indexChildren .intValue()); + renderChild(context, component_$indexChildren ); +} +#else + UIComponent component_$indexChildren = (UIComponent)evaluateExpression( "$ELVar" ); + renderChild(context, component_$indexChildren ); +#end +#end \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertComponent.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertComponent.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertComponent.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1 @@ +renderChild(context, (UIComponent)$value ); Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertFacet.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertFacet.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertFacet.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,4 @@ +UIComponent indexChildren_$index = component.getFacet("$FacetName"); +if (null != indexChildren_$index && indexChildren_$index .isRendered()) { + renderChild(context, indexChildren_$index); +} Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertResource.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertResource.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/insertResource.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1 @@ +variables.setVariable("$variable", getResource( "$resourceURI" ).getUri(context, component) ); Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/set.vm =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/set.vm (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/set.vm 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1 @@ +variables.setVariable("$variable", $expression ); \ No newline at end of file Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/tags.bin =================================================================== (Binary files differ) Property changes on: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/tags.bin ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/velocity.properties =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/velocity.properties (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/velocity.properties 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,3 @@ +resource.loader = classpath,antfile +classpath.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.ClasspathTemplateLoader +antfile.resource.loader.class = org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader Added: branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties =================================================================== --- branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties (rev 0) +++ branches/refactor1/cdk/generator/src/main/resources/org/ajax4jsf/templatecompiler/ant/velocity.properties 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,3 @@ +resource.loader classpath,antfile +classpath.resource.loader.class org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader +antfile.resource.loader.class org.ajax4jsf.templatecompiler.velocity.AntFileResourceLoader Added: branches/refactor1/cdk/generator/src/test/java/org/ajax4jsf/AppTest.java =================================================================== --- branches/refactor1/cdk/generator/src/test/java/org/ajax4jsf/AppTest.java (rev 0) +++ branches/refactor1/cdk/generator/src/test/java/org/ajax4jsf/AppTest.java 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,59 @@ +/** + * 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; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Added: branches/refactor1/cdk/pom.xml =================================================================== --- branches/refactor1/cdk/pom.xml (rev 0) +++ branches/refactor1/cdk/pom.xml 2007-06-28 20:26:00 UTC (rev 1390) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>cdk</artifactId> + <packaging>pom</packaging> + <name>JSF Components Development kit</name> + <version>1.1.2-SNAPSHOT</version> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> + <dependencies /> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>maven-cdk-plugin</module> + <module>compiler</module> + <module>generator</module> + <module>maven-archetype-jsf-component</module> + <module>maven-archetype-jsfwebapp</module> + </modules> +</project> \ No newline at end of file

17 years, 6 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
...
46
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 June 2007