December 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r16161 - branches/community/3.3.X/samples/richfaces-demo/functional-test.

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

Author: lfryc(a)redhat.com Date: 2009-12-17 05:40:49 -0500 (Thu, 17 Dec 2009) New Revision: 16161 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml Log: - rf-demo ftest - removed typo (tofile parameter in delete ant task) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-17 07:17:20 UTC (rev 16160) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-17 10:40:49 UTC (rev 16161) @@ -362,7 +362,7 @@ </goals> <configuration> <tasks> - <delete file="${demo.location}" tofile="${demo.deployable}" verbose="true" /> + <delete file="${demo.location}" verbose="true" /> </tasks> </configuration> </execution>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16160 - in branches/sandbox/rf-demo-ftest-iexplore: src/test/java/org/jboss/richfaces/integrationTest and 1 other directories.

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

Author: lfryc(a)redhat.com Date: 2009-12-17 02:17:20 -0500 (Thu, 17 Dec 2009) New Revision: 16160 Modified: branches/sandbox/rf-demo-ftest-iexplore/pom.xml branches/sandbox/rf-demo-ftest-iexplore/profiles.jboss-qa.xml branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java Log: - merge of changes in branch community/3.3.X to locally - r16027 through r16159 Modified: branches/sandbox/rf-demo-ftest-iexplore/pom.xml =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/pom.xml 2009-12-17 03:06:55 UTC (rev 16159) +++ branches/sandbox/rf-demo-ftest-iexplore/pom.xml 2009-12-17 07:17:20 UTC (rev 16160) @@ -7,7 +7,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.richfaces.integrationTest</groupId> - <artifactId>selenium-test</artifactId> + <artifactId>functional-test</artifactId> <packaging>jar</packaging> <name>selenium-test</name> <url>http://maven.apache.org</url> @@ -33,7 +33,7 @@ </snapshots> </repository> <repository> - <id>openqa</id> + <id>archiva.openqa.org</id> <name>OpenQA Repository</name> <url>http://archiva.openqa.org/repository/releases</url> <layout>default</layout> @@ -61,6 +61,8 @@ <properties> <demo.artifactId.suffix /> <demo.version>${project.version}</demo.version> + <demo.classifier></demo.classifier> + <demo.location></demo.location> <resources.dir>${project.build.directory}/test-classes</resources.dir> <extensions.dir>${resources.dir}/user-extensions</extensions.dir> <browser></browser> @@ -69,10 +71,15 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <selenium.host>localhost</selenium.host> <selenium.port>8444</selenium.port> + <selenium.debug>false</selenium.debug> + <selenium.maximize>false</selenium.maximize> <firefoxProfileTemplate></firefoxProfileTemplate> + <demo.deployable>${demo.deployable.directory}/${demo.deployable.file}</demo.deployable> + <demo.deployable.directory>${project.build.directory}</demo.deployable.directory> + <demo.deployable.file>richfaces-demo.war</demo.deployable.file> </properties> <build> - <finalName>seleniumTest</finalName> + <finalName>${project.artifactId}</finalName> <testResources> <testResource> <directory>src/test/resources</directory> @@ -193,12 +200,12 @@ </goals> <configuration> <background>true</background> - <debug>false</debug> <port>${selenium.port}</port> <userExtensions>${resources.dir}/custom-extensions.js</userExtensions> <logOutput>true</logOutput> - <browserSideLog>true</browserSideLog> - <debug>true</debug> + <logFile>${project.build.directory}/selenium/selenium-server.log</logFile> + <browserSideLog>${selenium.debug}</browserSideLog> + <debug>${selenium.debug}</debug> </configuration> </execution> </executions> @@ -219,7 +226,7 @@ <suiteXmlFiles> <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> </suiteXmlFiles> - <argLine>-Dbrowser='${browser}' -Dcontext.root='${context.root}' -Dcontext.path='${context.path}' -Dselenium.host='${selenium.host}' -Dselenium.port='${selenium.port}' -Dmaven.resources.dir='${resources.dir}' -Dmaven.project.build.directory='${project.build.directory}'</argLine> + <argLine>-Dbrowser='${browser}' -Dcontext.root='${context.root}' -Dcontext.path='${context.path}' -Dselenium.host='${selenium.host}' -Dselenium.port='${selenium.port}' -Dselenium.debug='${selenium.debug}' -Dselenium.maximize='${selenium.maximize}' -Dmaven.resources.dir='${resources.dir}' -Dmaven.project.build.directory='${project.build.directory}'</argLine> <firefoxProfileTemplate>${firefoxProfileTemplate}</firefoxProfileTemplate> <properties> <property> @@ -236,6 +243,11 @@ </profile> <profile> <id>jsf2_0</id> + <activation> + <property> + <name>jsf2</name> + </property> + </activation> <properties> <demo.artifactId.suffix>-jsf2</demo.artifactId.suffix> </properties> @@ -248,15 +260,6 @@ <name>containerId</name> </property> </activation> - <dependencies> - <dependency> - <groupId>org.richfaces.samples</groupId> - <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId> - <version>${demo.version}</version> - <type>war</type> - <scope>provided</scope> - </dependency> - </dependencies> <build> <plugins> <plugin> @@ -300,9 +303,8 @@ <type>installed</type> <deployables> <deployable> - <groupId>org.richfaces.samples</groupId> - <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId> <type>war</type> + <location>${demo.deployable}</location> <properties> <context>${context.path}</context> </properties> @@ -314,8 +316,92 @@ </plugins> </build> </profile> -  <profile> + <id>container-demoapp-deployable-dependency</id> + <activation> + <file> + <missing>${demo.location}</missing> + </file> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-richfaces-demo-war-dependency</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.richfaces.samples</groupId> + <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId> + <version>${demo.version}</version> + <classifier>${demo.classifier}</classifier> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${demo.deployable.directory}</outputDirectory> + <destFileName>${demo.deployable.file}</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>delete-richfaces-demo-war</id> + <phase>post-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <delete file="${demo.location}" tofile="${demo.deployable}" verbose="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>container-demoapp-deployable-location</id> + <activation> + <file> + <exists>${demo.location}</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-richfaces-demo-war-from-location</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${demo.location}" tofile="${project.build.directory}/richfaces-demo.war" verbose="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> +  + <profile> <id>container-jboss5x</id> <activation> <property> Modified: branches/sandbox/rf-demo-ftest-iexplore/profiles.jboss-qa.xml =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/profiles.jboss-qa.xml 2009-12-17 03:06:55 UTC (rev 16159) +++ branches/sandbox/rf-demo-ftest-iexplore/profiles.jboss-qa.xml 2009-12-17 07:17:20 UTC (rev 16160) @@ -2,6 +2,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + + <activeProfiles> + <activeProfile>container-installation</activeProfile> + </activeProfiles> + <profiles>  <profile> @@ -109,7 +114,32 @@ <browser.firefox>*firefox ${firefoxes.home}\firefox-${browser.version}\firefox.exe</browser.firefox> </properties> </profile> +  <profile> + <id>container-installation</id> + <properties> + <jboss5x.version>5.1.0.GA</jboss5x.version> + <jboss5x.installer.url.unix>file:/qa/tools/src/jboss/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix> + <jboss5x.installer.url.windows>file:t:\src\jboss\jboss-5.1.0.GA.zip</jboss5x.installer.url.windows> + <tomcat6x.version>6.0.18</tomcat6x.version> + <tomcat6x.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-6.0.18.zip</tomcat6x.installer.url.unix> + <tomcat6x.installer.url.windows>file:t:\src\apache\apache-tomcat-6.0.18.zip</tomcat6x.installer.url.windows> + </properties> + </profile> + <profile> + <id>container-installation-jsf2</id> + <activation> + <property> + <name>jsf2</name> + </property> + </activation> + <properties> + <jboss5x.version>5.1.0.GA</jboss5x.version> + <jboss5x.installer.url.unix>file:/qa/home/hudson/lfryc/jboss-jsf2/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix> + <jboss5x.installer.url.windows>file:h:\hudson\lfryc\jboss-jsf2\jboss-5.1.0.GA.zip</jboss5x.installer.url.windows> + </properties> + </profile> + <profile> <id>container-tomcat6x-installation</id> <activation> <property> @@ -118,9 +148,9 @@ </property> </activation> <properties> - <container.version>6.0.20</container.version> - <container.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-6.0.18.zip</container.installer.url.unix> - <container.installer.url.windows>file:C:\Documents and Settings\user\My Documents\distributions\apache-tomcat-6.0.20.zip</container.installer.url.windows> + <container.version>${tomcat6x.version}</container.version> + <container.installer.url.unix>${tomcat6x.installer.url.unix}</container.installer.url.unix> + <container.installer.url.windows>${tomcat6x.installer.url.windows}</container.installer.url.windows> </properties> </profile> <profile> @@ -132,9 +162,9 @@ </property> </activation> <properties> - <container.version>5.1.0.GA</container.version> - <container.installer.url.unix>file:/qa/tools/src/jboss/jboss-5.1.0.GA.zip</container.installer.url.unix> - <container.installer.url.windows>file:C:\Documents and Settings\user\My Documents\distributions\jboss-5.1.0.GA.zip</container.installer.url.windows> + <container.version>${jboss5x.version}</container.version> + <container.installer.url.unix>${jboss5x.installer.url.unix}</container.installer.url.unix> + <container.installer.url.windows>${jboss5x.installer.url.windows}</container.installer.url.windows> </properties> </profile> <profile> @@ -159,5 +189,22 @@ <container.installer.url>${container.installer.url.windows}</container.installer.url> </properties> </profile> +  + <profile> + <id>repository-exadel</id> + <repositories> + <repository> +  + <id>repository.exadel.com</id> + <url>http://repository.exadel.com</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + </profile> </profiles> </profilesXml> Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-12-17 03:06:55 UTC (rev 16159) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2009-12-17 07:17:20 UTC (rev 16160) @@ -69,6 +69,7 @@ */ protected String mavenProjectBuildDirectory; // usually ${project}/target protected String mavenResourcesDir; // usually ${project}/target/test-classes + protected boolean seleniumDebug; // if used specified debug mode of selenium testing /** * predefined waitings to use in inheritors @@ -92,7 +93,7 @@ TestRunner runner = (TestRunner) context; runner.addTestListener(loggingTestListener); } - + /** * Initializes context before each class run. * @@ -109,14 +110,16 @@ * specifies on which port should selenium server run */ @BeforeClass - @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "maven.resources.dir", - "maven.project.build.directory" }) + @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "selenium.debug", + "selenium.maximize", "maven.resources.dir", "maven.project.build.directory" }) public void initializeContext(String contextRoot, String contextPath, String browser, String seleniumHost, - String seleniumPort, String mavenResourcesDir, String mavenProjectBuildDirectory) { + String seleniumPort, String seleniumDebug, String seleniumMaximize, String mavenResourcesDir, + String mavenProjectBuildDirectory) { this.contextRoot = contextRoot; this.contextPath = contextPath; this.mavenResourcesDir = mavenResourcesDir; this.mavenProjectBuildDirectory = mavenProjectBuildDirectory; + this.seleniumDebug = Boolean.valueOf(seleniumDebug); selenium = RichfacesSelenium.getInstance(seleniumHost, Integer.valueOf(seleniumPort), browser, @@ -124,12 +127,18 @@ selenium.start(); allowInitialXpath(); loadCustomLocationStrategies(); + + + // adding selenium-side logging facility loggingTestListener.setSelenium(selenium); - selenium.windowFocus(); - selenium.windowMaximize(); + if (Boolean.valueOf(seleniumMaximize)) { + // focus and maximaze tested window + selenium.windowFocus(); + selenium.windowMaximize(); + } } - + /** * Uses selenium.addLocationStrategy to implement own strategies to locate * items in the tested page Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java 2009-12-17 03:06:55 UTC (rev 16159) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java 2009-12-17 07:17:20 UTC (rev 16160) @@ -157,6 +157,8 @@ // click the 'Up' button selenium.click(LOC_BUTTON_UP); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 4)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); @@ -185,6 +187,8 @@ // click the 'Up' button (5,6,7 -> 6,7,5) selenium.click(LOC_BUTTON_UP); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 4)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 6)); @@ -215,6 +219,8 @@ // click the 'Up' button (5,6,7 -> 6,7,5) selenium.click(LOC_BUTTON_UP); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 4)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 6)); @@ -240,6 +246,8 @@ // click the 'Down' button selenium.click(LOC_BUTTON_DOWN); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 6)); @@ -268,6 +276,8 @@ // click the 'Down' button (5,6,7 -> 7,5,6) selenium.click(LOC_BUTTON_DOWN); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 4)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 6)); @@ -298,6 +308,8 @@ // click the 'Down' button (5,6,7 -> 7,5,6) selenium.click(LOC_BUTTON_DOWN); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 4)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 5)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 6)); @@ -325,6 +337,8 @@ // click the 'Last' button (1,2,..,last-1,last --> 2,..,last,1) selenium.click(LOC_BUTTON_LAST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-2)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-1)); @@ -339,7 +353,7 @@ */ @Test public void testLastMultipleSongsShift() { - String[] before = new String[4]; + String[] before = new String[4]; String[] after = new String[4]; int countOfLines = getJQueryCount(LOC_TABLE_LINES); @@ -357,6 +371,8 @@ // click the 'Last' button (1,2,3,..,last --> 3,..,last,1,2) selenium.click(LOC_BUTTON_LAST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-3)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-2)); @@ -391,6 +407,8 @@ // click the 'Last' button (1,2,3,..,last --> 3,..,last,1,2) selenium.click(LOC_BUTTON_LAST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-3)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-2)); @@ -420,6 +438,8 @@ // click the 'First' button (1...last-1,last --> last,1...last-1) selenium.click(LOC_BUTTON_FIRST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 1)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, countOfLines-1)); @@ -453,6 +473,8 @@ // last-1,last,1...last-2) selenium.click(LOC_BUTTON_FIRST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 1)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 2)); @@ -488,6 +510,8 @@ // last-1,last,1...last-2) selenium.click(LOC_BUTTON_FIRST); + waitFor(1000); + after[0] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 0)); after[1] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 1)); after[2] = selenium.getText(format(LOC_TABLE_LINE_PREFORMATTED, 2));

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16159 - in branches/community/3.3.X/docs: cdkguide/en/src/main/docbook/modules and 5 other directories.

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

Author: SeanRogers Date: 2009-12-16 22:06:55 -0500 (Wed, 16 Dec 2009) New Revision: 16159 Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/devsample.xml branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/overview.xml branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/setup.xml branches/community/3.3.X/docs/faq/en/src/main/docbook/module/RFCfaq.xml branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/application_overview.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_actionparam.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandButton.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandLink.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_form.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_htmlCommandLink.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_include.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_jsFunction.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_keepAlive.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadBundle.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadScript.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadStyle.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_log.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_mediaOutput.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_outputPanel.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_poll.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_portlet.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_push.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_queue.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_region.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_repeat.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_status.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_support.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_ajaxValidator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_beanValidator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_colorPicker.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columnGroup.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columns.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_comboBox.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_componentControl.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_contextMenu.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataDefinitionList.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataFilterSlider.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataGrid.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataList.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataOrderedList.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_datascroller.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dndParam.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragIndicator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragSupport.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dropDownMenu.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_editor.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_effect.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_fileUpload.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_gmap.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_graphValidator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceInput.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceSelect.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSlider.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSpinner.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_insert.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layout.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layoutPanel.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_listShuttle.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuGroup.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuItem.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuSeparator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_message.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_messages.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_orderingList.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_page.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_paint2D.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuGroup.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuItem.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_pickList.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_progressBar.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_recursiveTreeNodesAdaptor.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_separator.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_simpleTogglePanel.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_spacer.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_subTable.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_tabPanel.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toggleControl.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_togglePanel.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBar.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBarGroup.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolTip.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNode.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNodesAdaptor.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCintro.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFClinks.xml branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml Log: Updated version references Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/includes/pcreate.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -14,7 +14,7 @@ At first we need to create a project for the component itself. In the library directory <property>Sandbox</property> you just created, launch the following command (all in one line): </para> - <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.1.GA -DartifactId=inputDate]]> + <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3.GA -DartifactId=inputDate]]> </programlisting> <para> As is easy to see a new directory with the name <property>inputDate</property> will be created. @@ -164,7 +164,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1.GA</version> + <version>3.3.3.GA</version> <executions> <execution> <phase>generate-sources</phase> @@ -202,7 +202,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.1.GA</version> + <version>3.3.3.GA</version> </dependency> </dependencies> </project>]]> Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/devsample.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/devsample.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/devsample.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -21,7 +21,7 @@ where you have created the <emphasis role="bold"><property><inputDate></property></emphasis> component and launch the following command (all in one line): </para> - <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.1.GA -DgroupId=org.mycompany -DartifactId=inputDate-sample]]></programlisting> + <programlisting role="XML"><![CDATA[mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.3.GA -DgroupId=org.mycompany -DartifactId=inputDate-sample]]></programlisting> <para> As easy to see a new directory <property>inputDate-sample</property> is created with the predefined JSF project structure: </para> @@ -194,4 +194,4 @@ Here you can find the whole <ulink url="examples/pom.xml">pom.xml</ulink> file. </para> </section> -</chapter> \ No newline at end of file +</chapter> Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/overview.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/overview.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/overview.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -104,7 +104,7 @@ <listitem> <para> add necessary jar files - (inputDate-1.0-SNAPSHOT.jar, jsf-api.jar, jsf-impl.jar, jstl-api-1.2.jar, richfaces-api-3.3.1.jar, richfaces-impl-3.3.1.jar, richfaces-ui-3.3.1.jar, commons-logging.jar, commons-digester.jar, commons-collections.jar, commons-beanutils.jar, common-annotations.jar) + (inputDate-1.0-SNAPSHOT.jar, jsf-api.jar, jsf-impl.jar, jstl-api-1.2.jar, richfaces-api-3.3.3.jar, richfaces-impl-3.3.3.jar, richfaces-ui-3.3.3.jar, commons-logging.jar, commons-digester.jar, commons-collections.jar, commons-beanutils.jar, common-annotations.jar) into the <property>WEB-INF/lib</property> folder </para> </listitem> Modified: branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/setup.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -180,7 +180,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.1.GA</version> + <version>3.3.3.GA</version> </dependency> </dependencies> </project>]]> Modified: branches/community/3.3.X/docs/faq/en/src/main/docbook/module/RFCfaq.xml =================================================================== --- branches/community/3.3.X/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -31,8 +31,8 @@ JBoss RichFaces Downloads area which can be found <ulink url="http://labs.jboss.com/jbossrichfaces/downloads/">here</ulink>. Source distribution you can see in the - <code>richfaces-ui-3.3.0-src.zip</code>. Binary - stored in <code>richfaces-ui-3.3.0-bin.zip</code> + <code>richfaces-ui-3.3.3-src.zip</code>. Binary + stored in <code>richfaces-ui-3.3.3-bin.zip</code> </para> </listitem> <listitem> Modified: branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml =================================================================== --- branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/migrationguide/en/src/main/docbook/included/contextMenuDisablement.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -44,8 +44,8 @@ <section> <title>Workarounds</title> <para> - Update to <property>RichFaces</property> 3.3.1. - By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.1 completely disables + Update to <property>RichFaces</property> 3.3.3. + By default, the <emphasis role="bold"><property><rich:contextMenu></property></emphasis> in <property>RichFaces</property> 3.3.3 completely disables right mouse click in the Context Menu area only. </para> </section> Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/application_overview.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -74,7 +74,7 @@ <para><code>mvn archetype:generate </code></para> <para><code>-DarchetypeGroupId=org.richfaces.cdk </code></para> <para><code>-DarchetypeArtifactId=maven-archetype-seam-app </code></para> - <para><code>-DarchetypeVersion=3.3.0-SNAPSHOT </code></para> + <para><code>-DarchetypeVersion=3.3.3-SNAPSHOT </code></para> <para><code>-DgroupId=[Your_project_group_id] </code></para> <para><code>-DartifactId=[Your_project_name] </code></para> <para>Some project preferences such as <property>RichFaces</property> components version or Jboss server version and others could be customized in the root <code>.pom</code> file </para> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_actionparam.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_actionparam.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_actionparam.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -206,4 +206,4 @@ TLD documentation</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandButton.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandButton.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandButton.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -201,4 +201,4 @@ </itemizedlist> --> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandLink.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandLink.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_commandLink.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -149,4 +149,4 @@ </listitem> </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_form.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_form.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_form.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -212,4 +212,4 @@ Attribute</ulink> section. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_htmlCommandLink.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_htmlCommandLink.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_htmlCommandLink.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -93,4 +93,4 @@ </emphasis> component. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_include.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_include.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_include.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -107,4 +107,4 @@ </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_jsFunction.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_jsFunction.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_jsFunction.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -142,4 +142,4 @@ </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_keepAlive.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_keepAlive.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_keepAlive.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -103,4 +103,4 @@ Search the <ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=261">RichFaces Users forum</ulink> for some additional information about usage of component. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadBundle.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadBundle.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadBundle.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -225,4 +225,4 @@ </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadScript.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadScript.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadScript.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -89,4 +89,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/script.jsf?c=loadScript">Script page at RichFaces LiveDemo</ulink> for examples of component usage abd their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadStyle.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadStyle.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_loadStyle.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -89,4 +89,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/style.jsf?c=loadStyle">Script page at RichFaces LiveDemo</ulink> for examples of component usage abd their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_log.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_log.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_log.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -113,4 +113,4 @@ </emphasis> might cause JavaScript error on <ulink url="http://www.jboss.org/community/wiki/AjaxCoreComponents"> Ajax Core Components Page.</ulink> </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_mediaOutput.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_mediaOutput.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_mediaOutput.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -212,4 +212,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/mediaOutput.jsf?c=med...">MediaOutput page</ulink> at RichFaces LiveDemo for more examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_outputPanel.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_outputPanel.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_outputPanel.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -216,4 +216,4 @@ </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_page.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -137,4 +137,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/page.jsf?c=page">AjaxPage page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_poll.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_poll.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_poll.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -238,4 +238,4 @@ Manage the <ulink url="http://jboss.com/index.html?module=bb&op=viewtopic&t=103909">RichFaces Users Forum</ulink> for fresh issues about the component usage. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_portlet.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_portlet.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_portlet.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -100,4 +100,4 @@ </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_push.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_push.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_push.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -175,4 +175,4 @@ Refer to <ulink url="http://www.jboss.org/community/wiki/SimpleIRCWidgetwitha4jpush"> Simple IRC Widget with <a4j:push></ulink> article to find out real-world usage of the <emphasis role="bold"><property><a4j:push></property></emphasis> component.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_queue.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_queue.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_queue.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -244,4 +244,4 @@ </para> <para>"<link linkend="QueuePrinciples">Queue Principles</link>" section of the RichFaces developer guide describes general Queue principles.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_region.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_region.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_region.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -234,4 +234,4 @@ </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_repeat.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_repeat.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_repeat.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -141,4 +141,4 @@ </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_status.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_status.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_status.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -175,4 +175,4 @@ </itemizedlist> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_support.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_support.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/a4j_support.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -280,4 +280,4 @@ </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_ajaxValidator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_ajaxValidator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_ajaxValidator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -259,4 +259,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/ajaxValidator.jsf?c=a...">AjaxValidator page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_beanValidator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_beanValidator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_beanValidator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -200,4 +200,4 @@ <property><rich:beanValidator></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_colorPicker.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_colorPicker.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_colorPicker.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -469,4 +469,4 @@ <property><rich:colorPicker></property> </emphasis> component usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columnGroup.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columnGroup.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columnGroup.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -218,4 +218,4 @@ <property><rich:columnGroup></property> </emphasis> usage and sources as well.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columns.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columns.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_columns.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -313,4 +313,4 @@ <property><rich:columns></property> </emphasis> component usage.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_comboBox.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_comboBox.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_comboBox.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -579,4 +579,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/comboBox.jsf?c=comboBox">ComboBox page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_componentControl.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_componentControl.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_componentControl.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -383,4 +383,4 @@ </emphasis> component You can find at <ulink url="http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/tlddocs/f/param.html"><f:param> TLD reference</ulink> in Java Server Faces technology section at Sun portal. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_contextMenu.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_contextMenu.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_contextMenu.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -558,4 +558,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/contextMenu.jsf?c=con...">ContextMenu page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataDefinitionList.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataDefinitionList.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataDefinitionList.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -181,4 +181,4 @@ <property><rich:dataDefinitionList></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataFilterSlider.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataFilterSlider.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataFilterSlider.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -241,4 +241,4 @@ <property><rich:dataFilterSlider></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataGrid.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataGrid.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataGrid.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -218,4 +218,4 @@ <property><rich:dataGrid></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataList.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataList.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataList.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -191,4 +191,4 @@ <property><rich:dataList></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataOrderedList.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataOrderedList.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dataOrderedList.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -227,4 +227,4 @@ usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_datascroller.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_datascroller.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_datascroller.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -609,4 +609,4 @@ The solution about how to make <emphasis role="bold"><property><rich:datascroller></property></emphasis> be updated after sorting/filtering can be found on <ulink url="http://www.jboss.org/community/wiki/richdataScrollerisnotupdatedaftersort...">Data Iteration Components FAQ. </ulink> </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dndParam.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dndParam.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dndParam.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -108,4 +108,4 @@ </tgroup> </table> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragIndicator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragIndicator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragIndicator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -238,4 +238,4 @@ <property><rich:dragIndicator></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragSupport.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragSupport.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dragSupport.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -304,4 +304,4 @@ usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dropDownMenu.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dropDownMenu.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_dropDownMenu.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -513,4 +513,4 @@ <property><rich:dropDownMenu></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_editor.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_editor.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_editor.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -792,4 +792,4 @@ <property><rich:editor></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_effect.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_effect.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_effect.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -197,4 +197,4 @@ </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_fileUpload.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_fileUpload.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_fileUpload.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -1095,4 +1095,4 @@ <ulink url=""><rich:fileUpload> with MyFaces</ulink> article describes how to avoid problems with <emphasis role="bold"><property><rich:fileUpload></property></emphasis> compenent caused by wrong application configuration. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_gmap.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_gmap.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_gmap.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -323,4 +323,4 @@ usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_graphValidator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_graphValidator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_graphValidator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -168,4 +168,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/graphValidator.jsf?c=...">GraphValidator page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceInput.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceInput.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceInput.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -704,4 +704,4 @@ <property><rich:inplaceIput></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceSelect.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceSelect.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inplaceSelect.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -723,4 +723,4 @@ <property><rich:inplaceSelect></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSlider.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSlider.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSlider.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -515,4 +515,4 @@ usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSpinner.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSpinner.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_inputNumberSpinner.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -314,4 +314,4 @@ <property><rich:inputNumberSpinner></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_insert.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_insert.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_insert.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -109,4 +109,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/insert.jsf?c=insert">Insert page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layout.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layout.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layout.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -117,7 +117,7 @@ <para>Visit <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/layouts.jsf">layout</ulink> page at RichFaces Live Demo for examples of component usage and their sources.</para> - <para>The <ulink url="http://www.jboss.org/community/docs/DOC-13336">Layout components for RichFaces 3.3.1</ulink> on the JBoss.org Wiki</para> + <para>The <ulink url="http://www.jboss.org/community/docs/DOC-13336">Layout components for RichFaces</ulink> on the JBoss.org Wiki</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layoutPanel.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layoutPanel.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_layoutPanel.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -131,4 +131,4 @@ </link> chapter of the guide.</para> <para>The <ulink url="http://www.jboss.org/community/docs/DOC-13336">Layout components for RichFaces 3.3.1</ulink> on the JBoss.org Wiki.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_listShuttle.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_listShuttle.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_listShuttle.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -873,4 +873,4 @@ <property><rich:listShuttle></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuGroup.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuGroup.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuGroup.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -276,4 +276,4 @@ <property><rich:menuGroup></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuItem.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuItem.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuItem.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -322,4 +322,4 @@ <property><rich:menuItem></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuSeparator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuSeparator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_menuSeparator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -93,4 +93,4 @@ <property><rich:menuSeparator></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_message.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_message.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_message.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -190,4 +190,4 @@ Visit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/message.jsf?c=message">Message page</ulink> at RichFaces LiveDemo for examples of component usage and their sources. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_messages.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_messages.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_messages.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -201,4 +201,4 @@ </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_orderingList.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_orderingList.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_orderingList.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -791,4 +791,4 @@ <property><rich:orderingList></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_page.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -291,4 +291,4 @@ <property><rich:page></property></emphasis>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_paint2D.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_paint2D.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_paint2D.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -177,4 +177,4 @@ <property><rich:paint2D></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuGroup.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuGroup.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuGroup.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -359,4 +359,4 @@ If you have any questions or ideas regarding the <emphasis role="bold"><property><rich:panelMenuGroup></property></emphasis> tell about them at the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4064191">RichFaces Users Forum</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuItem.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuItem.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_panelMenuItem.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -290,4 +290,4 @@ If you have any questions or ideas regarding the <emphasis role="bold"><property><rich:panelMenu></property></emphasis> tell about them at the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4064191">RichFaces Users Forum</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_pickList.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_pickList.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_pickList.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -596,4 +596,4 @@ <property><rich:pickList></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_progressBar.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_progressBar.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_progressBar.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -564,4 +564,4 @@ </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_recursiveTreeNodesAdaptor.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_recursiveTreeNodesAdaptor.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_recursiveTreeNodesAdaptor.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -160,4 +160,4 @@ <property><rich:recursiveTreeNodesAdaptor></property> </emphasis> usage. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_separator.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_separator.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_separator.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -172,4 +172,4 @@ <property><rich:separator></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_simpleTogglePanel.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_simpleTogglePanel.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_simpleTogglePanel.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -296,4 +296,4 @@ </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_spacer.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_spacer.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_spacer.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -131,4 +131,4 @@ <property><rich:spacer></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_subTable.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_subTable.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_subTable.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -273,4 +273,4 @@ <link linkend="customstyles">Definition of Custom Style Classes</link> section.</para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_tabPanel.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_tabPanel.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_tabPanel.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -325,4 +325,4 @@ If you have any questions or ideas regarding the <emphasis role="bold"><property><rich:tab></property></emphasis> tell about them at the <ulink url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4064191">RichFaces Users Forum</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toggleControl.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toggleControl.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toggleControl.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -183,4 +183,4 @@ <link linkend="customstyles">Definition of Custom Style Classes</link> section. </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_togglePanel.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_togglePanel.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_togglePanel.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -229,4 +229,4 @@ <property><rich:togglePanel></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBar.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBar.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBar.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -221,4 +221,4 @@ <property><rich:toolBar></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBarGroup.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBarGroup.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolBarGroup.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -150,4 +150,4 @@ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar">on the component Live Demo page</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolTip.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolTip.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_toolTip.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -475,4 +475,4 @@ <property><rich:toolTip></property> </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNode.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNode.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNode.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -302,4 +302,4 @@ <title>Relevant Resources Links</title> <para>How to Expand/Collapse Tree Nodes from code see in this<ulink url="http://labs.jboss.com/wiki/ExpandCollapsetreeNodesAdaptor">wiki article</ulink>. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNodesAdaptor.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNodesAdaptor.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/rich_treeNodesAdaptor.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -143,4 +143,4 @@ </emphasis> usage and sources for the given example. </para> </section> -</section> \ No newline at end of file +</section> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCfaq.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -43,12 +43,12 @@ <section> <?dbhtml filename="IstheredemoforRichFacescomponents.html"?> - <title>Where could I find a demo for RichFaces 3.1.0 components?</title> + <title>Where could I find a demo for RichFaces components?</title> <para>Online demo Web applications that show the most important functionality of RichFaces components are available on<ulink url="http://livedemo.exadel.com/richfaces-demo/">RichFaces Live Demo</ulink>.</para> <para>War file of a nightly build can be found on the <ulink - url="http://snapshots.jboss.org/maven2/org/richfaces/ui/richfaces-ui/3.3.0-SNA..." + url="http://snapshots.jboss.org/maven2/org/richfaces/ui/richfaces-ui/3.3.3-SNA..." >Snapshots repository</ulink>.</para> <para>Source Code (SVN) can be found in<ulink url="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/richfaces-demo/" Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCintro.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCintro.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCintro.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -43,4 +43,4 @@ </itemizedlist> <para>RichFaces UI components come ready to use out-of-the-box, so developers save their time and immediately gain the advantage of the mentioned above features in Web applications creation. As a result, usage experience can be faster and easily obtained.</para> -</chapter> \ No newline at end of file +</chapter> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFClinks.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFClinks.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFClinks.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -41,4 +41,4 @@ </tbody> </tgroup> </table> -</chapter> \ No newline at end of file +</chapter> Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-12-16 20:33:00 UTC (rev 16158) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml 2009-12-17 03:06:55 UTC (rev 16159) @@ -51,7 +51,7 @@ <para><property>RichFaces</property> was developed with an open architecture to be compatible with the widest possible variety of environments.</para> - <para>This is what you need to start working with <property>RichFaces 3.3.1</property>:</para> + <para>This is what you need to start working with <property>RichFaces 3.3.3</property>:</para> <itemizedlist> <listitem><para>Java</para></listitem>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16158 - in root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk: parser/el/node and 2 other directories.

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

Author: nbelaevski Date: 2009-12-16 15:33:00 -0500 (Wed, 16 Dec 2009) New Revision: 16158 Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java Log: https://jira.jboss.org/jira/browse/RF-7732 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el; import java.beans.BeanInfo; @@ -97,8 +95,9 @@ /** * Class, that encapsulate all functionality, related to Reflection calls, such as loading classes, get property * descriptors etc... + * * @author amarkhel - * + * */ public final class ELParserUtils { @@ -148,10 +147,11 @@ } } - private static Map<Class<?>, ClassDataHolder> classDataCache = - Collections.synchronizedMap(new HashMap<Class<?>, ClassDataHolder>()); + private static Map<Class<?>, ClassDataHolder> classDataCache = Collections + .synchronizedMap(new HashMap<Class<?>, ClassDataHolder>()); - private ELParserUtils() { } + private ELParserUtils() { + } private static ClassDataHolder resolveClassPropertiesAndMethods(Class<?> initialClass) throws ParsingException { ClassDataHolder classDataHolder = classDataCache.get(initialClass); @@ -165,10 +165,13 @@ } /** - * This method determine type of parsed node and create wrapper for them, that extends AbstractTreeNode. - * If node type is not recognized - throws ParsingException. - * @param child - parsed node - * @throws ParsingException - if node type is not recognized. + * This method determine type of parsed node and create wrapper for them, that extends AbstractTreeNode. If node + * type is not recognized - throws ParsingException. + * + * @param child + * - parsed node + * @throws ParsingException + * - if node type is not recognized. * @return wrapper for parsed node(if node type is recognized), that implement ITreeNode interface. */ public static ITreeNode determineNodeType(Node child) throws ParsingException { @@ -239,24 +242,26 @@ } else if (child instanceof AstBracketSuffix) { treeNode = new AstBracketSuffixTreeNode(child); } else { - throw new ParsingException("Node " + child.getClass().getSimpleName() + "[" + child.getImage() + "] is not recognized;"); + throw new ParsingException("Node " + child.getClass().getSimpleName() + "[" + child.getImage() + + "] is not recognized;"); } - //TODO: add support for closures - return treeNode; } /** * This method return PropertyDescriptor by specified propertyName and clazz. - * @param clazz - class to search - * @param propertyName - propertyName to search + * + * @param clazz + * - class to search + * @param propertyName + * - propertyName to search * @return property descriptor if found. - * @throws ParsingException if error occured. + * @throws ParsingException + * if error occured. */ - public static PropertyDescriptor getPropertyDescriptor(Class<?> clazz, String propertyName) - throws ParsingException { - + public static PropertyDescriptor getPropertyDescriptor(Class<?> clazz, String propertyName) throws ParsingException { + if (clazz == null) { return null; } @@ -266,17 +271,23 @@ } /** - * <p>Retrieve the property descriptors for the specified class, - * introspecting and caching them the first time a particular bean class - * is encountered.</p> - * - * <p><strong>FIXME</strong> - Does not work with DynaBeans.</p> - * - * @param beanClass Bean class for which property descriptors are requested + * <p> + * Retrieve the property descriptors for the specified class, introspecting and caching them the first time a + * particular bean class is encountered. + * </p> + * + * <p> + * <strong>FIXME</strong> - Does not work with DynaBeans. + * </p> + * + * @param beanClass + * Bean class for which property descriptors are requested * @return the property descriptors - * @throws ParsingException if error occured. - * - * @exception IllegalArgumentException if <code>beanClass</code> is null + * @throws ParsingException + * if error occured. + * + * @exception IllegalArgumentException + * if <code>beanClass</code> is null */ private static PropertyDescriptor[] getPropertyDescriptors(Class<?> beanClass) throws ParsingException { if (beanClass == null) { @@ -308,31 +319,35 @@ } /** - * <p>Find an accessible method that matches the given name and has compatible parameters. - * Compatible parameters mean that every method parameter is assignable from - * the given parameters. - * In other words, it finds a method with the given name - * that will take the parameters given.<p> - * - * <p>This method is slightly undeterminstic since it loops - * through methods names and return the first matching method.</p> - * - * <p>This method is used by - * {@link - * #invokeMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}. - * - * <p>This method can match primitive parameter by passing in wrapper classes. - * For example, a <code>Boolean</code> will match a primitive <code>boolean</code> - * parameter. - * - * @param clazz find method in this class - * @param methodName find method with this name - * @param parameterTypes find method with compatible parameters + * <p> + * Find an accessible method that matches the given name and has compatible parameters. Compatible parameters mean + * that every method parameter is assignable from the given parameters. In other words, it finds a method with the + * given name that will take the parameters given. + * <p> + * + * <p> + * This method is slightly undeterminstic since it loops through methods names and return the first matching method. + * </p> + * + * <p> + * This method is used by {@link #invokeMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}. + * + * <p> + * This method can match primitive parameter by passing in wrapper classes. For example, a <code>Boolean</code> will + * match a primitive <code>boolean</code> parameter. + * + * @param clazz + * find method in this class + * @param methodName + * find method with this name + * @param parameterTypes + * find method with compatible parameters * @return The accessible method - * @throws ParsingException if error occured. + * @throws ParsingException + * if error occured. */ - public static Type getMatchingVisibleMethodReturnType(Class<?> clazz, final String methodName, - Type[] parameterTypes) throws ParsingException { + public static Type getMatchingVisibleMethodReturnType(Class<?> clazz, final String methodName, Type[] parameterTypes) + throws ParsingException { if (clazz == null) { return TypesFactory.getType(Object.class); @@ -345,7 +360,7 @@ int paramSize = parameterTypes.length; Method bestMatch = null; - for (Method resolvedMethod: resolvedMethods) { + for (Method resolvedMethod : resolvedMethods) { if (!isMethodVisible(resolvedMethod)) { continue; } @@ -370,9 +385,13 @@ } if (match) { - //TODO handle overriden methods - bestMatch = resolvedMethod; - break; + if (bestMatch == null) { + bestMatch = resolvedMethod; + } else { + throw new ParsingException( + "Detected two methods with the alike signature, not able to select the appropriate one: " + + resolvedMethod.toString() + " " + bestMatch.toString()); + } } } } @@ -384,7 +403,6 @@ } } - interface ClassVisitor { public void visit(Class<?> clazz) throws ParsingException; } @@ -402,7 +420,7 @@ } public void walk(ClassVisitor visitor) throws ParsingException { - //BFS algorithm + // BFS algorithm while (!classesList.isEmpty()) { Class<?> clazz = classesList.remove(); @@ -427,10 +445,10 @@ } } - //While interfaces do not have Object.class in their hierarchy directly, - //implementations of interface are always inherited from Object. - //As methods in this class are primarily designed to work with implementations (beans), - //we are adding Object.class explicitly if it hasn't been visited yet. + // While interfaces do not have Object.class in their hierarchy directly, + // implementations of interface are always inherited from Object. + // As methods in this class are primarily designed to work with implementations (beans), + // we are adding Object.class explicitly if it hasn't been visited yet. if (visitedClasses.add(Object.class)) { visitor.visit(Object.class); } @@ -438,7 +456,7 @@ visitedClasses.clear(); } } - + public static void clearCaches() { classDataCache.clear(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -31,6 +31,7 @@ import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * @author Nick Belaevski @@ -72,8 +73,15 @@ sb.append(ELNodeConstants.RIGHT_BRACKET); - Type returnType = ELParserUtils.getMatchingVisibleMethodReturnType(methodHolderClass, methodName, argumentTypes - .toArray(EMPTY_TYPES_ARRAY)); + Type returnType = null; + + try { + returnType = ELParserUtils.getMatchingVisibleMethodReturnType(methodHolderClass, methodName, argumentTypes + .toArray(EMPTY_TYPES_ARRAY)); + } catch (ParsingException e) { + // TODO: handle exception + returnType = TypesFactory.getType(Object.class); + } visitor.setVariableType(returnType); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -50,12 +50,18 @@ return new String(chars); } - private final Method getReadMethod(Class<?> clazz, String propertyName) throws ParsingException { + private final Method getReadMethod(Class<?> clazz, String propertyName) { if (clazz == null) { return null; } - PropertyDescriptor propertyDescriptor = ELParserUtils.getPropertyDescriptor(clazz, propertyName); + PropertyDescriptor propertyDescriptor = null; + try { + propertyDescriptor = ELParserUtils.getPropertyDescriptor(clazz, propertyName); + } catch (ParsingException e) { + // TODO: handle exception + } + if (propertyDescriptor == null) { return null; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -32,11 +32,11 @@ */ public final class NullType implements Type { - public static final Type INSTANCE = new NullType(); - /** - * + * Singleton instance of {@link NullType} */ + public static final Type INSTANCE = new NullType(); + private NullType() { //this class is a singleton, thus has private ctor } @@ -70,7 +70,6 @@ */ @Override public Class<?> getRawType() { - //TODO review return Object.class; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -33,26 +33,16 @@ */ public class ReferencedType implements Type { - private String referencedClassName; + private String classCodeString; - private Class<?> knownType; - - public ReferencedType(String className) { - this(className, Object.class); - } - - public ReferencedType(String className, Class<?> knownType) { + public ReferencedType(String classCodeString) { super(); - this.referencedClassName = className; - this.knownType = knownType; + this.classCodeString = classCodeString; } - /** - * @return the referencedClassName - */ - String getReferencedClassName() { - return referencedClassName; + String getClassCodeString() { + return classCodeString; } /* (non-Javadoc) @@ -60,7 +50,7 @@ */ @Override public String getCode() { - return referencedClassName; + return classCodeString; } /* (non-Javadoc) @@ -76,7 +66,7 @@ */ @Override public Class<?> getRawType() { - return knownType; + return Object.class; } /* (non-Javadoc) @@ -102,7 +92,7 @@ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((referencedClassName == null) ? 0 : referencedClassName.hashCode()); + result = prime * result + ((classCodeString == null) ? 0 : classCodeString.hashCode()); return result; } @@ -121,11 +111,11 @@ return false; } ReferencedType other = (ReferencedType) obj; - if (referencedClassName == null) { - if (other.referencedClassName != null) { + if (classCodeString == null) { + if (other.classCodeString != null) { return false; } - } else if (!referencedClassName.equals(other.referencedClassName)) { + } else if (!classCodeString.equals(other.classCodeString)) { return false; } return true; @@ -163,7 +153,7 @@ if (anotherType instanceof ReferencedType) { ReferencedType anotherReferencedType = (ReferencedType) anotherType; - return getReferencedClassName().equals(anotherReferencedType.getReferencedClassName()); + return getClassCodeString().equals(anotherReferencedType.getClassCodeString()); } return false; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -23,6 +23,7 @@ import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; +import java.text.MessageFormat; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -35,6 +36,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.parser.el.Type; import org.richfaces.cdk.util.ArrayUtils; @@ -44,15 +47,17 @@ */ public final class TypesFactory { - private static final Map<java.lang.reflect.Type, Type> REFLECTION_TYPES_CACHE = - Collections.synchronizedMap(new HashMap<java.lang.reflect.Type, Type>()); + private static final Logger LOG = LoggerFactory.getLogger(); - private static final Map<String, Type> REFERENCED_TYPES_CACHE = - Collections.synchronizedMap(new HashMap<String, Type>()); - + private static final Map<java.lang.reflect.Type, Type> REFLECTION_TYPES_CACHE = Collections + .synchronizedMap(new HashMap<java.lang.reflect.Type, Type>()); + + private static final Map<String, Type> REFERENCED_TYPES_CACHE = Collections + .synchronizedMap(new HashMap<String, Type>()); + private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER_CLASSES_MAP; private static final Map<String, Class<?>> PRIMITIVE_CLASSES_MAP; - + static { Map<Class<?>, Class<?>> primitiveToWrapperClassesMap = new HashMap<Class<?>, Class<?>>(); primitiveToWrapperClassesMap.put(Boolean.TYPE, Boolean.class); @@ -63,42 +68,35 @@ primitiveToWrapperClassesMap.put(Byte.TYPE, Byte.class); primitiveToWrapperClassesMap.put(Double.TYPE, Double.class); primitiveToWrapperClassesMap.put(Character.TYPE, Character.class); - + PRIMITIVE_TO_WRAPPER_CLASSES_MAP = Collections.unmodifiableMap(primitiveToWrapperClassesMap); - + Map<String, Class<?>> primitiveClassesMap = new HashMap<String, Class<?>>(); for (Class<?> primitiveClass : PRIMITIVE_TO_WRAPPER_CLASSES_MAP.keySet()) { primitiveClassesMap.put(primitiveClass.getName(), primitiveClass); } - + PRIMITIVE_CLASSES_MAP = Collections.unmodifiableMap(primitiveClassesMap); } - - private static final Pattern CLASS_SIGNATURE_PATTERN = Pattern.compile("^" + - "\\s*([^\\[<]+)\\s*" + //class name - "(?:<\\s*(.*)\\s*>)?\\s*" + //generic signature - "((?:\\[\\s*\\]\\s*)+)?\\s*" + //array signature - "$"); + private static final Pattern CLASS_SIGNATURE_PATTERN = Pattern.compile("^" + "\\s*([^\\[<]+)\\s*" + // class name + "(?:<\\s*(.*)\\s*>)?\\s*" + // generic signature + "((?:\\[\\s*\\]\\s*)+)?\\s*" + // array signature + "$"); + private static final int CLASS_NAME_GROUP_IDX = 1; private static final int TYPE_ARGUMENTS_GROUP_IDX = 2; - + private static final int ARRAY_SIGNATURE_GROUP_IDX = 3; private static final int ARRAY_SIGNATURE_LENGTH = "[]".length(); - + private static final String[] GUESS_PACKAGES; static { - Class<?>[] guessPackagesClasses = { - UIComponent.class, - Behavior.class, - Converter.class, - FacesContext.class, - Collection.class, - Object.class - }; + Class<?>[] guessPackagesClasses = { UIComponent.class, Behavior.class, Converter.class, FacesContext.class, + Collection.class, Object.class }; GUESS_PACKAGES = new String[guessPackagesClasses.length]; int i = 0; @@ -116,126 +114,140 @@ plainClassType = new PlainClassType(plainClass); REFLECTION_TYPES_CACHE.put(plainClass, plainClassType); } - + return plainClassType; } - - private static Type getReferencedType(String referencedClassName) { - Type type = REFERENCED_TYPES_CACHE.get(referencedClassName); + + private static Type getReferencedType(String classCodeString) { + Type type = REFERENCED_TYPES_CACHE.get(classCodeString); if (type == null) { - type = new ReferencedType(referencedClassName); - REFERENCED_TYPES_CACHE.put(referencedClassName, type); + type = new ReferencedType(classCodeString); + REFERENCED_TYPES_CACHE.put(classCodeString, type); } - + return type; } - - private static Class<?> tryLoadClas(String type, ClassLoader classLoader) throws ClassNotFoundException { - int dotIndex = type.indexOf('.'); + + private static Class<?> tryLoadClas(String className, ClassLoader classLoader) throws ClassNotFoundException { + int dotIndex = className.indexOf('.'); if (dotIndex < 0) { - //guess type + // guess type for (String guessPackage : GUESS_PACKAGES) { + String guessTypeName = guessPackage + "." + className; try { - return Class.forName(guessPackage + "." + type, false, classLoader); + return Class.forName(guessTypeName, true, classLoader); } catch (ClassNotFoundException e) { - //ignore + // ignore } catch (LinkageError e) { - // TODO: handle exception + if (LOG.isInfoEnabled()) { + LOG.info(MessageFormat.format("Class {0} couldn't be loaded because of: {1}", guessTypeName, + e.getMessage())); + } } } } - Class<?> result = PRIMITIVE_CLASSES_MAP.get(type); + Class<?> result = PRIMITIVE_CLASSES_MAP.get(className); if (result == null) { - result = Class.forName(type, true, classLoader); + try { + result = Class.forName(className, true, classLoader); + } catch (LinkageError e) { + String errorMessage = MessageFormat.format("Class {0} couldn't be loaded because of: {1}", className, e.getMessage()); + if (LOG.isInfoEnabled()) { + LOG.info(errorMessage); + } + throw new ClassNotFoundException(errorMessage, e); + } } - + return result; } - + static Type[] parseTypeArgumentsString(String typeArguments, ClassLoader classLoader) { if (typeArguments == null) { return null; } - + String[] typeArgumentsSplit = typeArguments.trim().split(","); - + Type[] types = new Type[typeArgumentsSplit.length]; for (int i = 0; i < typeArgumentsSplit.length; i++) { types[i] = getType(typeArgumentsSplit[i], classLoader); } - + return types; } - + public static Type getType(String typeString, ClassLoader classLoader) { Matcher matcher = CLASS_SIGNATURE_PATTERN.matcher(typeString); boolean matchResult = matcher.matches(); - if (!matchResult) { - //TODO review - throw new IllegalArgumentException("Cannot parse type signature: " + typeString); - } - - String className = matcher.group(CLASS_NAME_GROUP_IDX).trim(); + if (matchResult) { + String className = matcher.group(CLASS_NAME_GROUP_IDX).trim(); - String typeArgumentsString = matcher.group(TYPE_ARGUMENTS_GROUP_IDX); - Type[] typeArguments = parseTypeArgumentsString(typeArgumentsString, classLoader); - - String arraySignature = matcher.group(ARRAY_SIGNATURE_GROUP_IDX); - int arrayDepth = 0; - if (arraySignature != null) { - arrayDepth = arraySignature.replaceAll("\\s+", "").length() / ARRAY_SIGNATURE_LENGTH; - } + String typeArgumentsString = matcher.group(TYPE_ARGUMENTS_GROUP_IDX); + Type[] typeArguments = parseTypeArgumentsString(typeArgumentsString, classLoader); - Type baseType; - try { - //NB: loadedClass can have name that differs from className! - Class<?> loadedClas = tryLoadClas(className, classLoader); + String arraySignature = matcher.group(ARRAY_SIGNATURE_GROUP_IDX); + int arrayDepth = 0; + if (arraySignature != null) { + arrayDepth = arraySignature.replaceAll("\\s+", "").length() / ARRAY_SIGNATURE_LENGTH; + } - baseType = getType(loadedClas); - } catch (ClassNotFoundException e) { - baseType = getReferencedType(className); - } - - if (arrayDepth != 0 || !ArrayUtils.isEmpty(typeArguments)) { - return new ComplexType(baseType, typeArguments, arrayDepth); + Type baseType; + try { + // NB: loadedClass can have name that differs from className! + Class<?> loadedClas = tryLoadClas(className, classLoader); + + baseType = getType(loadedClas); + } catch (ClassNotFoundException e) { + baseType = getReferencedType(className); + } + + if (arrayDepth != 0 || !ArrayUtils.isEmpty(typeArguments)) { + return new ComplexType(baseType, typeArguments, arrayDepth); + } else { + return baseType; + } } else { - return baseType; + if (LOG.isWarnEnabled()) { + LOG.warn(MessageFormat.format("Cannot parse type signature: ''{0}''", typeString)); + } + return getReferencedType(typeString); } } - + static Type createType(java.lang.reflect.Type reflectionType) { java.lang.reflect.Type[] actualTypeArguments = null; Class<?> rawType = null; int arrayDepth = 0; - - java.lang.reflect.Type localReflectionType = reflectionType; - + + java.lang.reflect.Type localReflectionType = reflectionType; + while (localReflectionType instanceof GenericArrayType) { localReflectionType = ((GenericArrayType) localReflectionType).getGenericComponentType(); arrayDepth++; } - + if (localReflectionType instanceof ParameterizedType) { ParameterizedType parameterizedType = (ParameterizedType) localReflectionType; - + actualTypeArguments = parameterizedType.getActualTypeArguments(); rawType = (Class<?>) parameterizedType.getRawType(); } else if (localReflectionType instanceof Class<?>) { rawType = (Class<?>) localReflectionType; } - + if (rawType != null) { while (rawType.isArray()) { arrayDepth++; rawType = rawType.getComponentType(); } - + Type[] typeArguments = null; if (!ArrayUtils.isEmpty(actualTypeArguments)) { typeArguments = getTypesArray(actualTypeArguments); } - + Type clearComponentType = getPlainClassType(rawType); if (!ArrayUtils.isEmpty(typeArguments) || arrayDepth != 0) { return new ComplexType(clearComponentType, typeArguments, arrayDepth); @@ -243,17 +255,18 @@ return clearComponentType; } } else { - return new UnsupportedType(reflectionType); + //TODO better way of handling unknown types + return getReferencedType(reflectionType.toString()); } } - + public static Type getType(java.lang.reflect.Type reflectionType) { Type result = REFLECTION_TYPES_CACHE.get(reflectionType); if (result == null) { result = createType(reflectionType); REFLECTION_TYPES_CACHE.put(reflectionType, result); } - + return result; } @@ -262,23 +275,22 @@ for (int i = 0; i < reflectionTypes.length; i++) { types[i] = getType(reflectionTypes[i]); } - + return types; } - + public static Type getNullType() { return NullType.INSTANCE; } - + public static void clearCaches() { REFLECTION_TYPES_CACHE.clear(); REFERENCED_TYPES_CACHE.clear(); } - + /** - * Returns wrapper classes for passed-in class. If type is primitive, then corresponding - * wrapper class is returned (e.g. boolean -> Boolean), otherwise does nothing and returns - * passed-in class. + * Returns wrapper classes for passed-in class. If type is primitive, then corresponding wrapper class is returned + * (e.g. boolean -> Boolean), otherwise does nothing and returns passed-in class. * * @return wrapper for primitive types, or passed-in class */ Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -1,145 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.cdk.parser.el.types; - -import java.util.Collection; -import java.util.Collections; - -import org.richfaces.cdk.parser.el.Type; - -/** - * @author Nick Belaevski - * - */ -//TODO replace with referenced type? -public class UnsupportedType implements Type { - - private java.lang.reflect.Type reflectionType; - - /** - * @param reflectionType - */ - public UnsupportedType(java.lang.reflect.Type reflectionType) { - this.reflectionType = reflectionType; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getCode() - */ - @Override - public String getCode() { - return reflectionType.toString(); - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getContainerType() - */ - @Override - public Type getContainerType() { - return null; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getImportsList() - */ - @Override - public Collection<Class<?>> getImportsList() { - return Collections.emptyList(); - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getRawType() - */ - @Override - public Class<?> getRawType() { - return Object.class; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() - */ - @Override - public Type[] getTypeArguments() { - return null; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isArray() - */ - @Override - public boolean isArray() { - return false; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) - */ - @Override - public boolean isAssignableFrom(Type anotherType) { - return false; - } - - /* (non-Javadoc) - * @see org.richfaces.cdk.parser.el.Type#isNullType() - */ - @Override - public boolean isNullType() { - return false; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((reflectionType == null) ? 0 : reflectionType.hashCode()); - return result; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - UnsupportedType other = (UnsupportedType) obj; - if (reflectionType == null) { - if (other.reflectionType != null) { - return false; - } - } else if (!reflectionType.equals(other.reflectionType)) { - return false; - } - return true; - } - -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-16 16:45:26 UTC (rev 16157) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-16 20:33:00 UTC (rev 16158) @@ -254,6 +254,29 @@ return false; } + private Type createTypeOfKnownClass(JavaClass initialClass, Class<?> knownSuperClass) { + assert !knownSuperClass.isInterface(); + + Type result = null; + + JavaClass javaClass = initialClass; + while (javaClass != null) { + Type type = TypesFactory.getType(javaClass.getFullName(), classLoader); + if (knownSuperClass.isAssignableFrom(type.getRawType())) { + result = type; + break; + } + + javaClass = javaClass.getSuperClass(); + } + + if (result == null) { + result = TypesFactory.getType(knownSuperClass); + } + + return result; + } + private void createMethodContext() { this.currentStatement = new MethodBody(); this.localsTypesMap = new HashMap<String, Type>(); @@ -264,29 +287,10 @@ //TODO: try load component class localsTypesMap.put(COMPONENT_VARIABLE, TypesFactory.getType(UIComponent.class)); - Type generatedClassSuperType = null; + Type generatedClassType = createTypeOfKnownClass(generatedClass, Renderer.class); + localsTypesMap.put(THIS_VARIABLE, generatedClassType); - JavaClass superClass = this.generatedClass.getSuperClass(); - if (superClass != null) { - try { - //TODO use TypesFactory - Class<?> loadedSuperClass = Class.forName(superClass.getFullName(), false, classLoader); - generatedClassSuperType = TypesFactory.getType(loadedSuperClass); - } catch (ClassNotFoundException e) { - LOG.warn(e.getMessage(), e); - } catch (LinkageError e) { - LOG.warn(e.getMessage(), e); - } - } - - if (generatedClassSuperType == null) { - //fallback to Renderer.class - generatedClassSuperType = TypesFactory.getType(Renderer.class); - } - - localsTypesMap.put(THIS_VARIABLE, generatedClassSuperType); - - //TODO - different classes for 'this' and 'super' + Type generatedClassSuperType = createTypeOfKnownClass(generatedClass.getSuperClass(), Renderer.class); localsTypesMap.put(SUPER_VARIABLE, generatedClassSuperType); } @@ -559,6 +563,7 @@ String typeString = cdkObjectElement.getType(); String typeArgumentsString = cdkObjectElement.getTypeArguments(); if (!Strings.isEmpty(typeArgumentsString)) { + //TODO: generic arrays typeString += "<" + typeArgumentsString + ">"; }

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16157 - in tags: 3.3.3.BETA1 and 221 other directories.

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

Author: konstantin.mishin Date: 2009-12-16 11:45:26 -0500 (Wed, 16 Dec 2009) New Revision: 16157 Added: tags/3.3.3.BETA1/ Modified: tags/3.3.3.BETA1/cdk/generator/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-theme/pom.xml tags/3.3.3.BETA1/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/cdk/maven-cdk-plugin/pom.xml tags/3.3.3.BETA1/cdk/maven-javascript-plugin/pom.xml tags/3.3.3.BETA1/cdk/maven-resource-dependency-plugin/pom.xml tags/3.3.3.BETA1/cdk/pom.xml tags/3.3.3.BETA1/cdk/richfaces-facelets/pom.xml tags/3.3.3.BETA1/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/docs/cdkguide/en/pom.xml tags/3.3.3.BETA1/docs/cdkguide/pom.xml tags/3.3.3.BETA1/docs/common-resources/en/pom.xml tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml tags/3.3.3.BETA1/docs/common-resources/pom.xml tags/3.3.3.BETA1/docs/faq/en/pom.xml tags/3.3.3.BETA1/docs/faq/pom.xml tags/3.3.3.BETA1/docs/highlight/pom.xml tags/3.3.3.BETA1/docs/migrationguide/en/pom.xml tags/3.3.3.BETA1/docs/migrationguide/pom.xml tags/3.3.3.BETA1/docs/photo_album_app_guide/en/pom.xml tags/3.3.3.BETA1/docs/photo_album_app_guide/pom.xml tags/3.3.3.BETA1/docs/pom.xml tags/3.3.3.BETA1/docs/userguide/en/pom.xml tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml tags/3.3.3.BETA1/docs/userguide/pom.xml tags/3.3.3.BETA1/examples/photoalbum/assembly/pom.xml tags/3.3.3.BETA1/examples/photoalbum/pom.xml tags/3.3.3.BETA1/examples/photoalbum/source/ear/pom.xml tags/3.3.3.BETA1/examples/photoalbum/source/ejb/pom.xml tags/3.3.3.BETA1/examples/photoalbum/source/pom.xml tags/3.3.3.BETA1/examples/photoalbum/source/web/pom.xml tags/3.3.3.BETA1/examples/photoalbum/tests/pom.xml tags/3.3.3.BETA1/extensions/gwt/pom.xml tags/3.3.3.BETA1/extensions/pom.xml tags/3.3.3.BETA1/extensions/seam/pom.xml tags/3.3.3.BETA1/extensions/trinidad/pom.xml tags/3.3.3.BETA1/framework/api/pom.xml tags/3.3.3.BETA1/framework/impl/pom.xml tags/3.3.3.BETA1/framework/impl/src/main/java/org/richfaces/VersionBean.java tags/3.3.3.BETA1/framework/jsf-test/pom.xml tags/3.3.3.BETA1/framework/pom.xml tags/3.3.3.BETA1/framework/test/pom.xml tags/3.3.3.BETA1/pom.xml tags/3.3.3.BETA1/samples/beanValidatorSample/pom.xml tags/3.3.3.BETA1/samples/calendar-sample/pom.xml tags/3.3.3.BETA1/samples/colorPickerDemo/pom.xml tags/3.3.3.BETA1/samples/columnsDemo/pom.xml tags/3.3.3.BETA1/samples/combobox-sample/pom.xml tags/3.3.3.BETA1/samples/contextMenuDemo/pom.xml tags/3.3.3.BETA1/samples/createProject.sh tags/3.3.3.BETA1/samples/darkX/pom.xml tags/3.3.3.BETA1/samples/dataFilterSliderDemo/pom.xml tags/3.3.3.BETA1/samples/dataTableDemo/pom.xml tags/3.3.3.BETA1/samples/datascroller-sample/pom.xml tags/3.3.3.BETA1/samples/dragDropDemo/pom.xml tags/3.3.3.BETA1/samples/dropdownmenu-sample/pom.xml tags/3.3.3.BETA1/samples/editor-sample/pom.xml tags/3.3.3.BETA1/samples/editorSeam-sample/pom.xml tags/3.3.3.BETA1/samples/effect-sample/pom.xml tags/3.3.3.BETA1/samples/extendedDataTable-sample/pom.xml tags/3.3.3.BETA1/samples/fileUploadDemo/pom.xml tags/3.3.3.BETA1/samples/functions-demo/pom.xml tags/3.3.3.BETA1/samples/glassX/pom.xml tags/3.3.3.BETA1/samples/gmap-sample/pom.xml tags/3.3.3.BETA1/samples/hotKey-sample/pom.xml tags/3.3.3.BETA1/samples/inplaceInput-sample/pom.xml tags/3.3.3.BETA1/samples/inplaceSelect-sample/pom.xml tags/3.3.3.BETA1/samples/inputNumberSliderDemo/pom.xml tags/3.3.3.BETA1/samples/inputNumberSpinnerDemo/pom.xml tags/3.3.3.BETA1/samples/jQuery-sample/pom.xml tags/3.3.3.BETA1/samples/jira-data/pom.xml tags/3.3.3.BETA1/samples/laguna/pom.xml tags/3.3.3.BETA1/samples/layout-sample/pom.xml tags/3.3.3.BETA1/samples/listShuttleDemo/pom.xml tags/3.3.3.BETA1/samples/local-value-demo/pom.xml tags/3.3.3.BETA1/samples/mediaOutput/pom.xml tags/3.3.3.BETA1/samples/modalpanel-sample/pom.xml tags/3.3.3.BETA1/samples/orderingListDemo/pom.xml tags/3.3.3.BETA1/samples/panel-sample/pom.xml tags/3.3.3.BETA1/samples/panelbar-sample/pom.xml tags/3.3.3.BETA1/samples/panelmenu-sample/pom.xml tags/3.3.3.BETA1/samples/pickList-sample/pom.xml tags/3.3.3.BETA1/samples/pom.xml tags/3.3.3.BETA1/samples/progressBarDemo/pom.xml tags/3.3.3.BETA1/samples/queue-sample/pom.xml tags/3.3.3.BETA1/samples/rich-message-demo/pom.xml tags/3.3.3.BETA1/samples/richfaces-art-datatable/pom.xml tags/3.3.3.BETA1/samples/richfaces-demo/functional-test/pom.xml tags/3.3.3.BETA1/samples/richfaces-demo/pom.xml tags/3.3.3.BETA1/samples/richfaces-ear-demo/ejb/pom.xml tags/3.3.3.BETA1/samples/richfaces-ear-demo/pom.xml tags/3.3.3.BETA1/samples/richfaces-ear-demo/richfacesEAR/pom.xml tags/3.3.3.BETA1/samples/richfaces-ear-demo/webapp/pom.xml tags/3.3.3.BETA1/samples/scrollableDataTableDemo/pom.xml tags/3.3.3.BETA1/samples/seamEAR/ear/pom.xml tags/3.3.3.BETA1/samples/seamEAR/ejbs/pom.xml tags/3.3.3.BETA1/samples/seamEAR/pom.xml tags/3.3.3.BETA1/samples/seamEAR/primary-source/pom.xml tags/3.3.3.BETA1/samples/seamEAR/projects/logging/pom.xml tags/3.3.3.BETA1/samples/seamEAR/projects/pom.xml tags/3.3.3.BETA1/samples/seamEAR/wars/pom.xml tags/3.3.3.BETA1/samples/seamEAR/wars/seamWebapp/pom.xml tags/3.3.3.BETA1/samples/seamIntegration/pom.xml tags/3.3.3.BETA1/samples/separator-sample/pom.xml tags/3.3.3.BETA1/samples/simpleTogglePanel-sample/pom.xml tags/3.3.3.BETA1/samples/skins/pom.xml tags/3.3.3.BETA1/samples/sortingFilteringDemo/pom.xml tags/3.3.3.BETA1/samples/state-sample/pom.xml tags/3.3.3.BETA1/samples/stdcomponents-sample/pom.xml tags/3.3.3.BETA1/samples/suggestionbox-sample/pom.xml tags/3.3.3.BETA1/samples/tabPanelDemo/pom.xml tags/3.3.3.BETA1/samples/themes/pom.xml tags/3.3.3.BETA1/samples/togglePanel-sample/pom.xml tags/3.3.3.BETA1/samples/tomahawkCompability/pom.xml tags/3.3.3.BETA1/samples/toolBarDemo/pom.xml tags/3.3.3.BETA1/samples/tooltip-sample/pom.xml tags/3.3.3.BETA1/samples/tree-demo/pom.xml tags/3.3.3.BETA1/samples/treeModelDemo/pom.xml tags/3.3.3.BETA1/samples/violetRays/pom.xml tags/3.3.3.BETA1/samples/virtualEarth-sample/pom.xml tags/3.3.3.BETA1/sandbox/api/pom.xml tags/3.3.3.BETA1/sandbox/cdk/pom.xml tags/3.3.3.BETA1/sandbox/impl/pom.xml tags/3.3.3.BETA1/sandbox/pom.xml tags/3.3.3.BETA1/sandbox/samples/dialog-window-sample/pom.xml tags/3.3.3.BETA1/sandbox/samples/editorOld-sample/pom.xml tags/3.3.3.BETA1/sandbox/samples/fileUploadPOC/pom.xml tags/3.3.3.BETA1/sandbox/samples/maven-rd-plugin-sample/pom.xml tags/3.3.3.BETA1/sandbox/samples/panel2-sample/pom.xml tags/3.3.3.BETA1/sandbox/samples/pom.xml tags/3.3.3.BETA1/sandbox/samples/rex-demo/pom.xml tags/3.3.3.BETA1/sandbox/samples/simpleTogglePanel2-sample/pom.xml tags/3.3.3.BETA1/sandbox/ui/create.bat tags/3.3.3.BETA1/sandbox/ui/create.sh tags/3.3.3.BETA1/sandbox/ui/dialog-window/pom.xml tags/3.3.3.BETA1/sandbox/ui/editorOld/pom.xml tags/3.3.3.BETA1/sandbox/ui/panel2/pom.xml tags/3.3.3.BETA1/sandbox/ui/pom.xml tags/3.3.3.BETA1/sandbox/ui/rex-button/pom.xml tags/3.3.3.BETA1/sandbox/ui/rex-messageBox/pom.xml tags/3.3.3.BETA1/sandbox/ui/rex-resizable/pom.xml tags/3.3.3.BETA1/sandbox/ui/simpleTogglePanel2/pom.xml tags/3.3.3.BETA1/sandbox/ui/sortableHeader/pom.xml tags/3.3.3.BETA1/sandbox/ui/treeTable/pom.xml tags/3.3.3.BETA1/test-applications/ajaxTest/pom.xml tags/3.3.3.BETA1/test-applications/automator/pom.xml tags/3.3.3.BETA1/test-applications/facelets/pom.xml tags/3.3.3.BETA1/test-applications/jsp/pom.xml tags/3.3.3.BETA1/test-applications/pom.xml tags/3.3.3.BETA1/test-applications/regression-test/pom.xml tags/3.3.3.BETA1/test-applications/regressionArea/pom.xml tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ear/pom.xml tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ejb/pom.xml tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-tests/pom.xml tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-web/pom.xml tags/3.3.3.BETA1/test-applications/richfaces-docs/pom.xml tags/3.3.3.BETA1/test-applications/seamApp/pom.xml tags/3.3.3.BETA1/test-applications/seleniumTest/pom.xml tags/3.3.3.BETA1/test-applications/seleniumTest/richfaces/pom.xml tags/3.3.3.BETA1/test-applications/seleniumTest/samples/pom.xml tags/3.3.3.BETA1/test-applications/test-jsp/pom.xml tags/3.3.3.BETA1/ui/assembly/pom.xml tags/3.3.3.BETA1/ui/beanValidator/pom.xml tags/3.3.3.BETA1/ui/calendar/pom.xml tags/3.3.3.BETA1/ui/colorPicker/pom.xml tags/3.3.3.BETA1/ui/columns/pom.xml tags/3.3.3.BETA1/ui/combobox/pom.xml tags/3.3.3.BETA1/ui/componentControl/pom.xml tags/3.3.3.BETA1/ui/contextMenu/pom.xml tags/3.3.3.BETA1/ui/core/pom.xml tags/3.3.3.BETA1/ui/create.bat tags/3.3.3.BETA1/ui/dataFilterSlider/pom.xml tags/3.3.3.BETA1/ui/dataTable/pom.xml tags/3.3.3.BETA1/ui/datascroller/pom.xml tags/3.3.3.BETA1/ui/drag-drop/pom.xml tags/3.3.3.BETA1/ui/dropdown-menu/pom.xml tags/3.3.3.BETA1/ui/editor/pom.xml tags/3.3.3.BETA1/ui/effect/pom.xml tags/3.3.3.BETA1/ui/extendedDataTable/pom.xml tags/3.3.3.BETA1/ui/fileUpload/pom.xml tags/3.3.3.BETA1/ui/functions/pom.xml tags/3.3.3.BETA1/ui/gmap/pom.xml tags/3.3.3.BETA1/ui/hotKey/pom.xml tags/3.3.3.BETA1/ui/inplaceInput/pom.xml tags/3.3.3.BETA1/ui/inplaceSelect/pom.xml tags/3.3.3.BETA1/ui/inputnumber-slider/pom.xml tags/3.3.3.BETA1/ui/inputnumber-spinner/pom.xml tags/3.3.3.BETA1/ui/insert/pom.xml tags/3.3.3.BETA1/ui/jQuery/pom.xml tags/3.3.3.BETA1/ui/layout/pom.xml tags/3.3.3.BETA1/ui/listShuttle/pom.xml tags/3.3.3.BETA1/ui/menu-components/pom.xml tags/3.3.3.BETA1/ui/message/pom.xml tags/3.3.3.BETA1/ui/modal-panel/pom.xml tags/3.3.3.BETA1/ui/orderingList/pom.xml tags/3.3.3.BETA1/ui/paint2D/pom.xml tags/3.3.3.BETA1/ui/panel/pom.xml tags/3.3.3.BETA1/ui/panelbar/pom.xml tags/3.3.3.BETA1/ui/panelmenu/pom.xml tags/3.3.3.BETA1/ui/pickList/pom.xml tags/3.3.3.BETA1/ui/pom.xml tags/3.3.3.BETA1/ui/progressBAR/pom.xml tags/3.3.3.BETA1/ui/scrollableDataTable/pom.xml tags/3.3.3.BETA1/ui/separator/pom.xml tags/3.3.3.BETA1/ui/simpleTogglePanel/pom.xml tags/3.3.3.BETA1/ui/spacer/pom.xml tags/3.3.3.BETA1/ui/state/pom.xml tags/3.3.3.BETA1/ui/suggestionbox/pom.xml tags/3.3.3.BETA1/ui/tabPanel/pom.xml tags/3.3.3.BETA1/ui/togglePanel/pom.xml tags/3.3.3.BETA1/ui/toolBar/pom.xml tags/3.3.3.BETA1/ui/tooltip/pom.xml tags/3.3.3.BETA1/ui/tree/pom.xml tags/3.3.3.BETA1/ui/treeModel/pom.xml tags/3.3.3.BETA1/ui/treeTable/pom.xml tags/3.3.3.BETA1/ui/virtualEarth/pom.xml Log: recreate tag for 3.3.3.BETA1 Copied: tags/3.3.3.BETA1 (from rev 16153, branches/community/3.3.X) Modified: tags/3.3.3.BETA1/cdk/generator/pom.xml =================================================================== --- branches/community/3.3.X/cdk/generator/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/generator/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Java Server Faces component generator</name> <build> <plugins> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsf-component</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -11,7 +11,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <configuration> <library> <prefix>${groupId}</prefix> @@ -41,7 +41,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-jsfwebapp</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -30,7 +30,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-plug-n-skin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Archetype - maven-archetype-plug-n-skin</name> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -34,7 +34,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>junit</groupId> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,11 +2,11 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-seam-app</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Archetype - maven-archetype-seam-app</name> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>${artifactId}</projectName> - <richfacesVersion>3.3.3-SNAPSHOT</richfacesVersion> + <richfacesVersion>3.3.3.BETA1</richfacesVersion> <seamVersion>2.0.1.GA</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.3.GA/jboss-4.2.3.GA/server/default/</jbossDeployDir> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-theme/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-theme/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,12 +3,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetype-theme</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>maven-archetype</packaging> <name>maven-archetype-theme</name> <build> Modified: tags/3.3.3.BETA1/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -10,7 +10,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> @@ -41,12 +41,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency>  Modified: tags/3.3.3.BETA1/cdk/maven-cdk-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-cdk-plugin/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>maven-plugin</packaging> <name>Maven plugin for JSF components code generation</name> <dependencies> @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>generator</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> <build> Modified: tags/3.3.3.BETA1/cdk/maven-javascript-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-javascript-plugin/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-javascript-plugin/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: tags/3.3.3.BETA1/cdk/maven-resource-dependency-plugin/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-resource-dependency-plugin/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/maven-resource-dependency-plugin/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -12,7 +12,7 @@ <artifactId>maven-resource-dependency-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>maven-resource-dependency-plugin</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> Modified: tags/3.3.3.BETA1/cdk/pom.xml =================================================================== --- branches/community/3.3.X/cdk/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>cdk</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: tags/3.3.3.BETA1/cdk/richfaces-facelets/pom.xml =================================================================== --- branches/community/3.3.X/cdk/richfaces-facelets/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/richfaces-facelets/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> <artifactId>richfaces-facelets</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>maven-archetype-rf-facelets</name> <packaging>maven-archetype</packaging> <parent> <artifactId>cdk</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <build> Modified: tags/3.3.3.BETA1/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/cdk/richfaces-facelets/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -28,7 +28,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: tags/3.3.3.BETA1/docs/cdkguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/cdkguide/en/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.cdkguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>jar</packaging> <name>Richfaces CDK Developer Guide (${translation})</name> Modified: tags/3.3.3.BETA1/docs/cdkguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/cdkguide/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>cdkguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>cdkguide</name> <description>Richfaces CDK Developer Guide</description> <pluginRepositories> Modified: tags/3.3.3.BETA1/docs/common-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/common-resources/en/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>common-resources</artifactId> <groupId>org.richfaces.docs</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.common-resources</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>jar</packaging> <name>Documentation common resources (${translation})</name> <description> @@ -17,7 +17,7 @@ <dependency> <groupId>org.richfaces.docs</groupId> <artifactId>highlight</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> <build> Modified: tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <artifactId>richfacesguide-archetype</artifactId> <packaging>maven-archetype</packaging> <name>richfacesguide-archetype</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <extensions> <extension> Modified: tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/en/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.richfacesguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>jar</packaging> <name>Richfaces Guide Template</name> Modified: tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>richfacesguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>richfacesguide</name> <description>Richfaces Guide Template</description> <pluginRepositories> Modified: tags/3.3.3.BETA1/docs/common-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/common-resources/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>common-resources</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>pom</packaging> <name>Documentation common resources</name> <description>Common resources</description> Modified: tags/3.3.3.BETA1/docs/faq/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/en/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/faq/en/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.faq</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> <build> Modified: tags/3.3.3.BETA1/docs/faq/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/faq/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>faq</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>FAQ</name> <description>Frequently asked questions</description>  Modified: tags/3.3.3.BETA1/docs/userguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/userguide/en/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,12 +5,12 @@ <parent> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> Modified: tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCGettingStarted.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -335,7 +335,7 @@ <para>Now you have everything to create the project using the "maven-archetype-jsfwebapp" archetype. Create a folder that will house your project and run the this command in it:</para> <programlisting role="XML" ><![CDATA[... -mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.docs.richfaces -DartifactId=jsf-app +mvn archetype:generate -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp -DarchetypeVersion=3.3.3.BETA1 -DgroupId=org.docs.richfaces -DartifactId=jsf-app ...]]></programlisting> @@ -461,17 +461,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> ...]]></programlisting> Modified: tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3837,7 +3837,7 @@ <listitem> <para> <code>archetypeVersion</code> indicates the RichFaces version. For example, - <code>"3.3.3-SNAPSHOT"</code> + <code>"3.3.3.BETA1"</code> </para> </listitem> <listitem> @@ -4078,7 +4078,7 @@ follow the steps described in the previous section.</para> <para>This command will be used to create a template of the new skin project. </para> <programlisting role="XML"><![CDATA[ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin -DarchetypeVersion=3.3.3-SNAPSHOT -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-plug-n-skin -DarchetypeVersion=3.3.3.BETA1 -DartifactId=P-n-S -DgroupId=GROUPID -Dversion=1.0.-SNAPSHOT ]]></programlisting> <para> Now you can browse the "P-n-S" folder to view what files and folders were created there. </para> Modified: tags/3.3.3.BETA1/docs/userguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/docs/userguide/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> Modified: tags/3.3.3.BETA1/examples/photoalbum/assembly/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/assembly/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/assembly/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: tags/3.3.3.BETA1/examples/photoalbum/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Photoalbum Demo Application Root</name> <modules> Modified: tags/3.3.3.BETA1/examples/photoalbum/source/ear/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ear/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/source/ear/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: tags/3.3.3.BETA1/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/source/ejb/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: tags/3.3.3.BETA1/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/source/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -8,7 +8,7 @@ <artifactId>photoalbum</artifactId> <packaging>pom</packaging> <name>${appName}</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <distributionManagement> <downloadUrl> Modified: tags/3.3.3.BETA1/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/source/web/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: tags/3.3.3.BETA1/examples/photoalbum/tests/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/examples/photoalbum/tests/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>photoalbum-root</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: tags/3.3.3.BETA1/extensions/gwt/pom.xml =================================================================== --- branches/community/3.3.X/extensions/gwt/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/extensions/gwt/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>extensions</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: tags/3.3.3.BETA1/extensions/pom.xml =================================================================== --- branches/community/3.3.X/extensions/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/extensions/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>extensions</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Richfaces extensions for a different environments</name> <packaging>pom</packaging> <modules> Modified: tags/3.3.3.BETA1/extensions/seam/pom.xml =================================================================== --- branches/community/3.3.X/extensions/seam/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/extensions/seam/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>jboss</groupId> Modified: tags/3.3.3.BETA1/extensions/trinidad/pom.xml =================================================================== --- branches/community/3.3.X/extensions/trinidad/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/extensions/trinidad/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -35,7 +35,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>ajax4jsf</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.apache.myfaces.trinidad</groupId> Modified: tags/3.3.3.BETA1/framework/api/pom.xml =================================================================== --- branches/community/3.3.X/framework/api/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/api/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <name>Java Server Faces AJAX framework API</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <dependencies> <dependency> Modified: tags/3.3.3.BETA1/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/impl/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,13 +3,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>${classifiedArtifactId}</artifactId> <name>Java Server Faces AJAX framework implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <resources> <resource> @@ -249,7 +249,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/framework/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-12-16 16:45:26 UTC (rev 16157) @@ -38,7 +38,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = "3-SNAPSHOT" ; + public static final String REVISION = "3.BEATA1" ; public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$"; public static final Version _version = new Version(); Modified: tags/3.3.3.BETA1/framework/jsf-test/pom.xml =================================================================== --- branches/community/3.3.X/framework/jsf-test/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/jsf-test/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,13 +4,13 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <dependencies> <dependency> Modified: tags/3.3.3.BETA1/framework/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>framework</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>pom</packaging> <name>Java Server Faces AJAX framework</name> Modified: tags/3.3.3.BETA1/framework/test/pom.xml =================================================================== --- branches/community/3.3.X/framework/test/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/framework/test/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,12 +3,12 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Ajax4Jsf test framework</name> <url>https://ajax4jsf.dev.java.net</url> Modified: tags/3.3.3.BETA1/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <artifactId>root</artifactId> <packaging>pom</packaging> <name>Jboss RichFaces project</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> Modified: tags/3.3.3.BETA1/samples/beanValidatorSample/pom.xml =================================================================== --- branches/community/3.3.X/samples/beanValidatorSample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/beanValidatorSample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>beanValidatorSample</artifactId> <packaging>war</packaging> <name>beanValidatorSample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <finalName>richfaces-validator</finalName> <plugins> @@ -34,7 +34,7 @@  <dependency> <groupId>org.slf4j</groupId> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.uwyn</groupId> Modified: tags/3.3.3.BETA1/samples/calendar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/calendar-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/calendar-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/colorPickerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/colorPickerDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/colorPickerDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -40,17 +40,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>colorPicker</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> Modified: tags/3.3.3.BETA1/samples/columnsDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/columnsDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/columnsDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/combobox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/combobox-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/combobox-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/contextMenuDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/contextMenuDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/contextMenuDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/createProject.sh =================================================================== --- branches/community/3.3.X/samples/createProject.sh 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/createProject.sh 2009-12-16 16:45:26 UTC (rev 16157) @@ -1,3 +1,3 @@ #!/bin/sh mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsfwebapp \ - -DarchetypeVersion=3.3.3-SNAPSHOT -Dversion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.samples -DartifactId=$1 + -DarchetypeVersion=3.3.3.BETA1 -Dversion=3.3.3.BETA1 -DgroupId=org.richfaces.samples -DartifactId=$1 Modified: tags/3.3.3.BETA1/samples/darkX/pom.xml =================================================================== --- branches/community/3.3.X/samples/darkX/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/darkX/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/samples/dataFilterSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataFilterSliderDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/dataFilterSliderDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/dataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dataTableDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/dataTableDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/datascroller-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/datascroller-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/datascroller-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/dragDropDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/dragDropDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/dragDropDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/dropdownmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/dropdownmenu-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/dropdownmenu-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/editor-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editor-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/editor-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/samples/editorSeam-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/editorSeam-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/editorSeam-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/samples/effect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/effect-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/effect-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/extendedDataTable-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/extendedDataTable-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/extendedDataTable-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/samples/fileUploadDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/fileUploadDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/fileUploadDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/functions-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/functions-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/functions-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/glassX/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> <name>glassX</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/samples/gmap-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/gmap-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/gmap-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/hotKey-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/hotKey-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/hotKey-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/samples/inplaceInput-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceInput-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/inplaceInput-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/inplaceSelect-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/inplaceSelect-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/inplaceSelect-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/inputNumberSliderDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSliderDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/inputNumberSliderDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/inputNumberSpinnerDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/inputNumberSpinnerDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/inputNumberSpinnerDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/jQuery-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/jQuery-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/jQuery-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/jira-data/pom.xml =================================================================== --- branches/community/3.3.X/samples/jira-data/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/jira-data/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/laguna/pom.xml =================================================================== --- branches/community/3.3.X/samples/laguna/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/laguna/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <configuration> <name>org.richfaces.laguna</name> </configuration> Modified: tags/3.3.3.BETA1/samples/layout-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/layout-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/layout-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,14 +4,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <artifactId>layout-sample</artifactId> <packaging>war</packaging> <name>layout Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <finalName>layout-sample</finalName> <plugins> @@ -34,17 +34,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <exclusions> <exclusion> <groupId>org.richfaces.ui</groupId> Modified: tags/3.3.3.BETA1/samples/listShuttleDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/listShuttleDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/listShuttleDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/local-value-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/local-value-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/local-value-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/mediaOutput/pom.xml =================================================================== --- branches/community/3.3.X/samples/mediaOutput/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/mediaOutput/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,11 +5,11 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces</groupId> <artifactId>mediaOutput</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>war</packaging> <name>mediaOutput Maven Webapp</name> <build> Modified: tags/3.3.3.BETA1/samples/modalpanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/modalpanel-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/modalpanel-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/orderingListDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/orderingListDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/orderingListDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/panel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panel-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/panel-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/panelbar-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelbar-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/panelbar-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/panelmenu-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/panelmenu-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/panelmenu-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/pickList-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/pickList-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/pickList-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/samples/progressBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/progressBarDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/progressBarDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/queue-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/queue-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/queue-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>queue-sample</artifactId> <packaging>war</packaging> <name>queue-sample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <finalName>queue-sample</finalName> <plugins> Modified: tags/3.3.3.BETA1/samples/rich-message-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/rich-message-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/rich-message-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-art-datatable/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-art-datatable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-art-datatable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-demo/functional-test/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.richfaces.integrationTest</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -246,22 +246,22 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>laguna</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>glassX</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>darkX</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -356,12 +356,12 @@ <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>javax.persistence</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-ear-demo/ejb/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/ejb/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-ear-demo/ejb/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-ear-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-ear-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: tags/3.3.3.BETA1/samples/richfaces-ear-demo/webapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-ear-demo/webapp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/richfaces-ear-demo/webapp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>richfaces-ear-demo</artifactId> <groupId>org.richfaces.samples</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples.richfaces-ear-demo</groupId> Modified: tags/3.3.3.BETA1/samples/scrollableDataTableDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/scrollableDataTableDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/scrollableDataTableDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>scrollableDataTableDemo</artifactId> Modified: tags/3.3.3.BETA1/samples/seamEAR/ear/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ear/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/ear/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <dependencies> <dependency> Modified: tags/3.3.3.BETA1/samples/seamEAR/ejbs/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/ejbs/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/ejbs/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <dependencies> <dependency> Modified: tags/3.3.3.BETA1/samples/seamEAR/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/seamEAR/primary-source/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/primary-source/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/primary-source/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <dependencies> <dependency> Modified: tags/3.3.3.BETA1/samples/seamEAR/projects/logging/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/logging/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/projects/logging/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,6 +7,6 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>projects</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> </project> Modified: tags/3.3.3.BETA1/samples/seamEAR/projects/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/projects/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/projects/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modules> <module>logging</module> Modified: tags/3.3.3.BETA1/samples/seamEAR/wars/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/wars/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples</groupId> <artifactId>seamEAR</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modules> <module>seamWebapp</module> Modified: tags/3.3.3.BETA1/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamEAR/wars/seamWebapp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamEAR/wars/seamWebapp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -7,7 +7,7 @@ <parent> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>wars</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <build> <finalName>seamWebapp</finalName> @@ -22,17 +22,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <scope>provided</scope> </dependency> <dependency> Modified: tags/3.3.3.BETA1/samples/seamIntegration/pom.xml =================================================================== --- branches/community/3.3.X/samples/seamIntegration/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/seamIntegration/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,7 +5,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/separator-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/separator-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/separator-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/simpleTogglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/simpleTogglePanel-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/simpleTogglePanel-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/skins/pom.xml =================================================================== --- branches/community/3.3.X/samples/skins/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/skins/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/sortingFilteringDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/sortingFilteringDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/sortingFilteringDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -16,7 +16,7 @@  <dependency> Modified: tags/3.3.3.BETA1/samples/state-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/state-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/state-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -16,17 +16,17 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>state</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/samples/stdcomponents-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/stdcomponents-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/stdcomponents-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/suggestionbox-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/suggestionbox-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/suggestionbox-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/tabPanelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tabPanelDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/tabPanelDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/themes/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>themes</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>themes</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/samples/togglePanel-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/togglePanel-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/togglePanel-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/tomahawkCompability/pom.xml =================================================================== --- branches/community/3.3.X/samples/tomahawkCompability/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/tomahawkCompability/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/toolBarDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/toolBarDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/toolBarDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/tooltip-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/tooltip-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/tooltip-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/tree-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/tree-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/tree-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/treeModelDemo/pom.xml =================================================================== --- branches/community/3.3.X/samples/treeModelDemo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/treeModelDemo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/violetRays/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,18 +4,18 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.samples</groupId> <artifactId>violetRays</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>violetRays</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/samples/virtualEarth-sample/pom.xml =================================================================== --- branches/community/3.3.X/samples/virtualEarth-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/samples/virtualEarth-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> Modified: tags/3.3.3.BETA1/sandbox/api/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/api/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/api/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,13 +2,13 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> <name>Richfaces Sandbox API</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> @@ -25,12 +25,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: tags/3.3.3.BETA1/sandbox/cdk/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/cdk/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/cdk/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,12 +2,12 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>cdk</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <packaging>pom</packaging> <name>JSF Components Development kit</name> <dependencies /> Modified: tags/3.3.3.BETA1/sandbox/impl/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/impl/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/impl/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,28 +2,28 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> <name>Richfaces Sandbox Implementation</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <dependencies> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: tags/3.3.3.BETA1/sandbox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/sandbox/samples/dialog-window-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/dialog-window-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/dialog-window-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/sandbox/samples/editorOld-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/editorOld-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/editorOld-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/sandbox/samples/fileUploadPOC/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/fileUploadPOC/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/fileUploadPOC/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/sandbox/samples/maven-rd-plugin-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,14 +2,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk.sandbox</groupId> <artifactId>maven-rd-plugin-sample</artifactId> <packaging>war</packaging> <name>maven-rd-plugin-sample Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <pluginRepositories> <pluginRepository> @@ -33,7 +33,7 @@ <plugin> <artifactId>maven-resource-dependency-plugin</artifactId> <groupId>org.richfaces.cdk</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <configuration> <scriptFilePath>scripts/custom-dependencies.js</scriptFilePath> <styleFilePath>css/custom-dependencies.xcss</styleFilePath> @@ -59,7 +59,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/samples/panel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/panel2-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/panel2-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/sandbox/samples/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>samples</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/sandbox/samples/rex-demo/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/rex-demo/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/rex-demo/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> @@ -178,7 +178,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -193,28 +193,28 @@ <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-resizable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-button</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>rex-messageBox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.sandbox</groupId> <artifactId>richfaces-sandbox-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> Modified: tags/3.3.3.BETA1/sandbox/samples/simpleTogglePanel2-sample/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/samples/simpleTogglePanel2-sample/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> Modified: tags/3.3.3.BETA1/sandbox/ui/create.bat =================================================================== --- branches/community/3.3.X/sandbox/ui/create.bat 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/create.bat 2009-12-16 16:45:26 UTC (rev 16157) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3.BETA1 -DgroupId=org.richfaces.ui -DartifactId=%1 \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/create.sh =================================================================== --- branches/community/3.3.X/sandbox/ui/create.sh 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/create.sh 2009-12-16 16:45:26 UTC (rev 16157) @@ -1,2 +1,2 @@ #!/bin/sh -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3.BETA1 -DgroupId=org.richfaces.ui -DartifactId=${1} \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/dialog-window/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/dialog-window/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/dialog-window/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -39,12 +39,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <scope>provided</scope> </dependency> </dependencies> Modified: tags/3.3.3.BETA1/sandbox/ui/editorOld/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/editorOld/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/editorOld/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/panel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/panel2/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/panel2/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -3,7 +3,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> Modified: tags/3.3.3.BETA1/sandbox/ui/rex-button/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-button/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/rex-button/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/rex-messageBox/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-messageBox/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/rex-messageBox/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -43,7 +43,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/rex-resizable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/rex-resizable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/rex-resizable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/sandbox/ui/simpleTogglePanel2/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/simpleTogglePanel2/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/simpleTogglePanel2/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/sortableHeader/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/sortableHeader/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/sortableHeader/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>sortableHeader</artifactId> <name>sortableHeader</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -52,17 +52,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/sandbox/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/sandbox/ui/treeTable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/sandbox/ui/treeTable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/test-applications/ajaxTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/ajaxTest/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -55,7 +55,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>javax.el</groupId> Modified: tags/3.3.3.BETA1/test-applications/automator/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/automator/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/automator/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/test-applications/facelets/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/facelets/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/facelets/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/test-applications/jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/jsp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/jsp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/test-applications/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <relativePath>../samples</relativePath> </parent> @@ -50,11 +50,11 @@ <groupId>org.richfaces</groupId> <artifactId>test-applications</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>RichFaces Test Applications</name> <properties> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.3.BETA1</rfVersion> </properties> <modules> Modified: tags/3.3.3.BETA1/test-applications/regression-test/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regression-test/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,7 +5,7 @@ <artifactId>regression-test</artifactId> <name>Regression test application</name> <packaging>war</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <description>Application for manual testing of regressions.</description> <url>http://www.jboss.org/richfaces</url> <inceptionYear>2009</inceptionYear> @@ -48,7 +48,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <exclusions> <exclusion> <artifactId>richfaces-impl</artifactId> @@ -59,7 +59,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> Modified: tags/3.3.3.BETA1/test-applications/regressionArea/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regressionArea/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,12 +4,12 @@  <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> <packaging>pom</packaging> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Regresion Area:Seam Application</name> <repositories> <repository> @@ -60,7 +60,7 @@ <properties> <contextroot>regressionArea</contextroot> <earname>regressionArea-ear</earname> - <richversion>3.3.3-SNAPSHOT</richversion> + <richversion>3.3.3.BETA1</richversion> <seamversion>2.1.1.GA</seamversion> <jsfversion>1.2_11</jsfversion> <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome> Modified: tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ear/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ear/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -6,9 +6,9 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ear</artifactId> <name>Regression Area Ear Module</name> Modified: tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-ejb</artifactId> Modified: tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>regressionArea</artifactId> <groupId>org.richfaces.test-applications</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.test-applications.regressionArea</groupId> Modified: tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/regressionArea/regressionArea-web/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,7 +4,7 @@ <parent> <groupId>org.richfaces.test-applications</groupId> <artifactId>regressionArea</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>regressionArea-web</artifactId> Modified: tags/3.3.3.BETA1/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/richfaces-docs/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -204,7 +204,7 @@ <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> @@ -214,7 +214,7 @@ <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> @@ -224,7 +224,7 @@ <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> Modified: tags/3.3.3.BETA1/test-applications/seamApp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/seamApp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -8,7 +8,7 @@ <name>sample application</name> <properties> <projectName>seamApp</projectName> - <rfVersion>3.3.3-SNAPSHOT</rfVersion> + <rfVersion>3.3.3.BETA1</rfVersion> <seamVersion>2.1.0.SP1</seamVersion> <jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip</jbossDownloadURL> <jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir> Modified: tags/3.3.3.BETA1/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/seleniumTest/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,14 +5,14 @@ <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> <packaging>pom</packaging> <name>SeleniumTest</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <url>http://maven.apache.org</url> <properties> <http.port>8085</http.port> @@ -233,7 +233,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>javax.faces</groupId> Modified: tags/3.3.3.BETA1/test-applications/seleniumTest/richfaces/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/seleniumTest/richfaces/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,14 +5,14 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>richfaces</artifactId> <packaging>war</packaging> <name>seleniumTest Maven Webapp</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <finalName>richfaces</finalName> </build> Modified: tags/3.3.3.BETA1/test-applications/seleniumTest/samples/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/samples/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/seleniumTest/samples/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -5,13 +5,13 @@ <parent> <groupId>seleniumTest</groupId> <artifactId>seleniumTest</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>seleniumTest</groupId> <artifactId>samples</artifactId> <name>Samples</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <finalName>seleniumTest</finalName> <plugins> Modified: tags/3.3.3.BETA1/test-applications/test-jsp/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/test-jsp/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/test-applications/test-jsp/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>test-applications</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: tags/3.3.3.BETA1/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/assembly/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -15,7 +15,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -435,17 +435,17 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-jsf2</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </profile> Modified: tags/3.3.3.BETA1/ui/beanValidator/pom.xml =================================================================== --- branches/community/3.3.X/ui/beanValidator/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/beanValidator/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,19 +4,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>beanValidator</artifactId> <name>beanValidator</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.hibernate</groupId> Modified: tags/3.3.3.BETA1/ui/calendar/pom.xml =================================================================== --- branches/community/3.3.X/ui/calendar/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/calendar/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> @@ -46,7 +46,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inputnumber-spinner</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/colorPicker/pom.xml =================================================================== --- branches/community/3.3.X/ui/colorPicker/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/colorPicker/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -12,7 +12,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/columns/pom.xml =================================================================== --- branches/community/3.3.X/ui/columns/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/columns/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: tags/3.3.3.BETA1/ui/combobox/pom.xml =================================================================== --- branches/community/3.3.X/ui/combobox/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/combobox/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> <name>combobox</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>suggestionbox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> Modified: tags/3.3.3.BETA1/ui/componentControl/pom.xml =================================================================== --- branches/community/3.3.X/ui/componentControl/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/componentControl/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/contextMenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/contextMenu/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/contextMenu/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/core/pom.xml =================================================================== --- branches/community/3.3.X/ui/core/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/core/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/create.bat =================================================================== --- branches/community/3.3.X/ui/create.bat 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/create.bat 2009-12-16 16:45:26 UTC (rev 16157) @@ -1 +1 @@ -mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3-SNAPSHOT -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file +mvn archetype:create -DarchetypeGroupId=org.richfaces.cdk -DarchetypeArtifactId=maven-archetype-jsf-component -DarchetypeVersion=3.3.3.BETA1 -DgroupId=org.richfaces -DartifactId=%1 \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/dataFilterSlider/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataFilterSlider/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/dataFilterSlider/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -14,7 +14,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/dataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/dataTable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/dataTable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> --> </dependencies> Modified: tags/3.3.3.BETA1/ui/datascroller/pom.xml =================================================================== --- branches/community/3.3.X/ui/datascroller/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/datascroller/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/drag-drop/pom.xml =================================================================== --- branches/community/3.3.X/ui/drag-drop/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/drag-drop/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> --> </dependencies> Modified: tags/3.3.3.BETA1/ui/dropdown-menu/pom.xml =================================================================== --- branches/community/3.3.X/ui/dropdown-menu/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/dropdown-menu/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/editor/pom.xml =================================================================== --- branches/community/3.3.X/ui/editor/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/editor/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/ui/effect/pom.xml =================================================================== --- branches/community/3.3.X/ui/effect/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/effect/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/extendedDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/extendedDataTable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/extendedDataTable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -64,40 +64,40 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>contextMenu</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>jQuery</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>componentControl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/fileUpload/pom.xml =================================================================== --- branches/community/3.3.X/ui/fileUpload/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/fileUpload/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>fileUpload</artifactId> <name>fileUpload</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,7 +51,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/functions/pom.xml =================================================================== --- branches/community/3.3.X/ui/functions/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/functions/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/gmap/pom.xml =================================================================== --- branches/community/3.3.X/ui/gmap/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/gmap/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/hotKey/pom.xml =================================================================== --- branches/community/3.3.X/ui/hotKey/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/hotKey/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/inplaceInput/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceInput/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/inplaceInput/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> <name>inplaceInput</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/inplaceSelect/pom.xml =================================================================== --- branches/community/3.3.X/ui/inplaceSelect/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/inplaceSelect/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceSelect</artifactId> <name>inplaceSelect</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -51,12 +51,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>combobox</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>inplaceInput</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> Modified: tags/3.3.3.BETA1/ui/inputnumber-slider/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/inputnumber-slider/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/inputnumber-spinner/pom.xml =================================================================== --- branches/community/3.3.X/ui/inputnumber-spinner/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/inputnumber-spinner/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/ui/insert/pom.xml =================================================================== --- branches/community/3.3.X/ui/insert/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/insert/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/jQuery/pom.xml =================================================================== --- branches/community/3.3.X/ui/jQuery/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/jQuery/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/layout/pom.xml =================================================================== --- branches/community/3.3.X/ui/layout/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/layout/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -4,18 +4,18 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>layout</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>layout</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/ui/listShuttle/pom.xml =================================================================== --- branches/community/3.3.X/ui/listShuttle/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/listShuttle/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> Modified: tags/3.3.3.BETA1/ui/menu-components/pom.xml =================================================================== --- branches/community/3.3.X/ui/menu-components/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/menu-components/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/message/pom.xml =================================================================== --- branches/community/3.3.X/ui/message/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/message/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>message</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <name>Message</name> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/modal-panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/modal-panel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/modal-panel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/orderingList/pom.xml =================================================================== --- branches/community/3.3.X/ui/orderingList/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/orderingList/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/paint2D/pom.xml =================================================================== --- branches/community/3.3.X/ui/paint2D/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/paint2D/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/panel/pom.xml =================================================================== --- branches/community/3.3.X/ui/panel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/panel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/ui/panelbar/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelbar/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/panelbar/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/panelmenu/pom.xml =================================================================== --- branches/community/3.3.X/ui/panelmenu/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/panelmenu/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/pickList/pom.xml =================================================================== --- branches/community/3.3.X/ui/pickList/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/pickList/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>pickList</artifactId> <name>pickList</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -53,13 +53,13 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>listShuttle</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>orderingList</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> Modified: tags/3.3.3.BETA1/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> @@ -187,12 +187,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>commons-collections</groupId> @@ -249,7 +249,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-test</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <scope>test</scope> </dependency> <dependency> Modified: tags/3.3.3.BETA1/ui/progressBAR/pom.xml =================================================================== --- branches/community/3.3.X/ui/progressBAR/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/progressBAR/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> <name>progressBar</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/scrollableDataTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/scrollableDataTable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/scrollableDataTable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -70,12 +70,12 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>dataTable</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>core</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/separator/pom.xml =================================================================== --- branches/community/3.3.X/ui/separator/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/separator/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> Modified: tags/3.3.3.BETA1/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/simpleTogglePanel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/spacer/pom.xml =================================================================== --- branches/community/3.3.X/ui/spacer/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/spacer/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/state/pom.xml =================================================================== --- branches/community/3.3.X/ui/state/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/state/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/suggestionbox/pom.xml =================================================================== --- branches/community/3.3.X/ui/suggestionbox/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/suggestionbox/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/tabPanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/tabPanel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/tabPanel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/togglePanel/pom.xml =================================================================== --- branches/community/3.3.X/ui/togglePanel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/togglePanel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/toolBar/pom.xml =================================================================== --- branches/community/3.3.X/ui/toolBar/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/toolBar/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/tooltip/pom.xml =================================================================== --- branches/community/3.3.X/ui/tooltip/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/tooltip/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/tree/pom.xml =================================================================== --- branches/community/3.3.X/ui/tree/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/tree/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>drag-drop</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/treeModel/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeModel/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/treeModel/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <id>generate-sources</id> @@ -45,7 +45,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>tree</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: tags/3.3.3.BETA1/ui/treeTable/pom.xml =================================================================== --- branches/community/3.3.X/ui/treeTable/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/treeTable/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>treeTable</artifactId> <name>treeTable</name> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase> Modified: tags/3.3.3.BETA1/ui/virtualEarth/pom.xml =================================================================== --- branches/community/3.3.X/ui/virtualEarth/pom.xml 2009-12-16 15:50:42 UTC (rev 16153) +++ tags/3.3.3.BETA1/ui/virtualEarth/pom.xml 2009-12-16 16:45:26 UTC (rev 16157) @@ -2,7 +2,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3.BETA1</version> <executions> <execution> <phase>generate-sources</phase>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16156 - tags.

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

Author: konstantin.mishin Date: 2009-12-16 11:06:40 -0500 (Wed, 16 Dec 2009) New Revision: 16156 Removed: tags/3.3.3.BETA1/ Log: will be recreated

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16155 - branches/community/3.3.X/samples/richfaces-demo/functional-test.

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

Author: lfryc(a)redhat.com Date: 2009-12-16 10:57:53 -0500 (Wed, 16 Dec 2009) New Revision: 16155 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml Log: - rf-demo ftest - added omitted demo.artifactId.suffix to richfaces-demo dependency, added property jsf2 to activate profiles "jsf2" and "container-installation-jsf2" Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-16 15:51:57 UTC (rev 16154) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2009-12-16 15:57:53 UTC (rev 16155) @@ -243,6 +243,11 @@ </profile> <profile> <id>jsf2_0</id> + <activation> + <property> + <name>jsf2</name> + </property> + </activation> <properties> <demo.artifactId.suffix>-jsf2</demo.artifactId.suffix> </properties> @@ -333,7 +338,7 @@ <artifactItems> <artifactItem> <groupId>org.richfaces.samples</groupId> - <artifactId>richfaces-demo</artifactId> + <artifactId>richfaces-demo${demo.artifactId.suffix}</artifactId> <version>${demo.version}</version> <classifier>${demo.classifier}</classifier> <type>war</type> Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2009-12-16 15:51:57 UTC (rev 16154) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/profiles.jboss-qa.xml 2009-12-16 15:57:53 UTC (rev 16155) @@ -33,17 +33,6 @@ <demo.version>${profile.demo.version}</demo.version> </properties> </profile> - <profile> - <id>demo-found-in-workspace</id> - <activation> - <file> - <exists>richfaces-demo.war</exists> - </file> - </activation> - <properties> - <demo.location>./richfaces-demo.war</demo.location> - </properties> - </profile>  <profile> <id>browser-internet-explorer</id> @@ -139,6 +128,11 @@ </profile> <profile> <id>container-installation-jsf2</id> + <activation> + <property> + <name>jsf2</name> + </property> + </activation> <properties> <jboss5x.version>5.1.0.GA</jboss5x.version> <jboss5x.installer.url.unix>file:/qa/home/hudson/lfryc/jboss-jsf2/jboss-5.1.0.GA.zip</jboss5x.installer.url.unix>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16154 - in root/cdk/trunk/plugins/generator/src: main/resources/META-INF/templates/java and 1 other directories.

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

Author: nbelaevski Date: 2009-12-16 10:51:57 -0500 (Wed, 16 Dec 2009) New Revision: 16154 Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java Removed: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypeUtilsTest.java Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java Log: https://jira.jboss.org/jira/browse/RF-7732 Fixed NPE in CDK Fixed CheckStyle errors in CDK Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-16 15:50:42 UTC (rev 16153) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-16 15:51:57 UTC (rev 16154) @@ -139,6 +139,7 @@ <xs:attribute name="name" form="unqualified" type="literalExpression" use="required" /> <xs:attribute name="value" form="unqualified" /> <xs:attribute name="type" form="unqualified" /> + <xs:attribute name="type-arguments" form="unqualified" /> </xs:extension> </xs:simpleContent> </xs:complexType> Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl 2009-12-16 15:50:42 UTC (rev 16153) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl 2009-12-16 15:51:57 UTC (rev 16154) @@ -1 +1 @@ -${modelItem.type} ${modelItem.name} <#if modelItem.initializationExpression.length() != 0> = ${modelItem.initializationExpression}</#if>; \ No newline at end of file +${modelItem.type.code} ${modelItem.name} <#if modelItem.initializationExpression.length() != 0> = ${modelItem.initializationExpression}</#if>; \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java 2009-12-16 15:50:42 UTC (rev 16153) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/Bean.java 2009-12-16 15:51:57 UTC (rev 16154) @@ -102,10 +102,6 @@ this.readOnly = readOnly; } - public Object count(Object o) { - return null; - } - public Integer count(Integer i) { return null; } Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2009-12-16 15:50:42 UTC (rev 16153) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2009-12-16 15:51:57 UTC (rev 16154) @@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.lang.reflect.Type; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -35,9 +34,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; public class ELParserTest { @@ -57,68 +57,68 @@ public void testNull() throws Exception { parseExpression("#{null}"); assertEquals("null", visitor.getParsedExpression()); - assertTrue(ELParserUtils.isNullType(visitor.getVariableType())); + assertTrue(visitor.getVariableType().isNullType()); } @Test public void testTrue() throws Exception { parseExpression("#{true}"); assertEquals("true", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testFalse() throws Exception { parseExpression("#{false}"); assertEquals("false", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testFloat() throws Exception { parseExpression("#{5.0}"); assertEquals("Double.valueOf(5.0)", visitor.getParsedExpression()); - assertEquals(Double.TYPE, visitor.getVariableType()); + assertEquals(Double.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{5.012e+34}"); assertEquals("Double.valueOf(5.012e+34)", visitor.getParsedExpression()); - assertEquals(Double.TYPE, visitor.getVariableType()); + assertEquals(Double.TYPE, visitor.getVariableType().getRawType()); } @Test public void testNegative() throws Exception { parseExpression("#{-5}"); assertEquals("-5", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testNegativeFloat() throws Exception { parseExpression("#{-5.0}"); assertEquals("-Double.valueOf(5.0)", visitor.getParsedExpression()); - assertEquals(Double.TYPE, visitor.getVariableType()); + assertEquals(Double.TYPE, visitor.getVariableType().getRawType()); } @Test public void testNotEqual() throws Exception { parseExpression("#{1 ne 3}"); assertEquals("(1 != 3)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{2 != 3}"); assertEquals("(2 != 3)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testNot() throws Exception { parseExpression("#{not test}"); assertEquals("(!test)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{!otherTest}"); assertEquals("(!otherTest)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test @@ -126,171 +126,171 @@ //TODO: tests involving double values parseExpression("#{1+2}"); assertEquals("(1 + 2)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testMinus() throws Exception { parseExpression("#{1-2}"); assertEquals("(1 - 2)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testDiv() throws Exception { parseExpression("#{1/2}"); assertEquals("(1 / 2)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testMult() throws Exception { parseExpression("#{1*2}"); assertEquals("(1 * 2)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testMod() throws Exception { parseExpression("#{1%2}"); assertEquals("(1 % 2)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testAnd() throws Exception { parseExpression("#{test and otherTest}"); assertEquals("(test && otherTest)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{otherTest && test}"); assertEquals("(otherTest && test)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testOr() throws Exception { parseExpression("#{test or otherTest}"); assertEquals("(test || otherTest)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{otherTest || test}"); assertEquals("(otherTest || test)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testEquals() throws Exception { parseExpression("#{1 eq 2}"); assertEquals("(1 == 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{3 == 2}"); assertEquals("(3 == 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testGreatThen() throws Exception { parseExpression("#{1 gt 2}"); assertEquals("(1 > 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{3 > 2}"); assertEquals("(3 > 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testLessThen() throws Exception { parseExpression("#{1 lt 2}"); assertEquals("(1 < 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{3 < 2}"); assertEquals("(3 < 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testLessThenEquals() throws Exception { parseExpression("#{1 le 2}"); assertEquals("(1 <= 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{3 <= 2}"); assertEquals("(3 <= 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testGreatThenEquals() throws Exception { parseExpression("#{1 ge 2}"); assertEquals("(1 >= 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{3 >= 2}"); assertEquals("(3 >= 2)", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testChoice() throws Exception { parseExpression("#{test ? 2 : 3}"); assertEquals("(test ? 2 : 3)", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); parseExpression("#{test ? null : 'string'}"); assertEquals("(test ? null : \"string\")", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test public void testInteger() throws Exception { parseExpression("#{152}"); assertEquals("152", visitor.getParsedExpression()); - assertEquals(Integer.TYPE, visitor.getVariableType()); + assertEquals(Integer.TYPE, visitor.getVariableType().getRawType()); } @Test public void testString() throws Exception { parseExpression("#{\"nabc\"}"); assertEquals("\"nabc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("#{'nabc'}"); assertEquals("\"nabc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("#{'\tabc'}"); assertEquals("\"\\tabc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("#{'/nabc'}"); assertEquals("\"/nabc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("#{'na\"bc'}"); assertEquals("\"na\\\"bc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("#{'na\\\\bc'}"); assertEquals("\"na\\\\bc\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test public void testIdentifier() throws Exception { parseExpression("#{clientId}"); assertEquals("clientId", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test public void testLiteral() throws Exception { parseExpression("clientId"); assertEquals("\"clientId\"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test @@ -298,8 +298,8 @@ parseExpression("#{action.facets}"); assertEquals("action.getFacets()", visitor.getParsedExpression()); Type variableType = visitor.getVariableType(); - assertEquals(Map.class, ELParserUtils.getRawType(variableType)); - assertEquals(UIComponent.class, ELParserUtils.getLastTypeArgument(variableType)); + assertEquals(Map.class, variableType.getRawType()); + assertEquals(UIComponent.class, variableType.getContainerType().getRawType()); parseExpression("#{action.rawMap}"); assertEquals("action.getRawMap()", visitor.getParsedExpression()); @@ -309,15 +309,15 @@ public void testMethodReturnMapElement() throws Exception { parseExpression("#{action.getFacet('header')}"); assertEquals("action.getFacet(\"header\")", visitor.getParsedExpression()); - assertEquals(UIComponent.class, visitor.getVariableType()); + assertEquals(UIComponent.class, visitor.getVariableType().getRawType()); parseExpression("#{action.facets['header']}"); assertEquals("action.getFacets().get(\"header\")", visitor.getParsedExpression()); - assertEquals(UIComponent.class, visitor.getVariableType()); + assertEquals(UIComponent.class, visitor.getVariableType().getRawType()); parseExpression("#{action.rawMap['something']}"); assertEquals("action.getRawMap().get(\"something\")", visitor.getParsedExpression()); - assertEquals(Object.class, visitor.getVariableType()); + assertEquals(Object.class, visitor.getVariableType().getRawType()); } // @Test @@ -329,7 +329,7 @@ public void testMethodReturnMapElement2() throws Exception { parseExpression("#{action.facets.toString()}"); assertEquals("action.getFacets().toString()", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test @@ -339,21 +339,21 @@ parseExpression("#{action.facets['header'].rendered}"); assertEquals("action.getFacets().get(\"header\").isRendered()", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testMethod() throws Exception { parseExpression("#{action.readOnly}"); assertEquals("action.isReadOnly()", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testNestedMethod() throws Exception { parseExpression("#{action.testBean2.string}"); assertEquals("action.getTestBean2().getString()", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test @@ -361,36 +361,36 @@ parseExpression("#{action.components}"); assertEquals("action.getComponents()", visitor.getParsedExpression()); Type variableType = visitor.getVariableType(); - assertEquals(List.class, ELParserUtils.getRawType(variableType)); - assertEquals(UIComponent.class, ELParserUtils.getLastTypeArgument(variableType)); + assertEquals(List.class, variableType.getRawType()); + assertEquals(UIComponent.class, variableType.getContainerType().getRawType()); } @Test public void testMethodReturnListElement() throws Exception { parseExpression("#{action.components[0]}"); assertEquals("action.getComponents().get(0)", visitor.getParsedExpression()); - assertEquals(UIComponent.class, visitor.getVariableType()); + assertEquals(UIComponent.class, visitor.getVariableType().getRawType()); } @Test public void testMethodReturnListElement2() throws Exception { parseExpression("#{action.components[0].rendered}"); assertEquals("action.getComponents().get(0).isRendered()", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test public void testMethodReturnArray() throws Exception { parseExpression("#{action.array}"); assertEquals("action.getArray()", visitor.getParsedExpression()); - assertEquals(UIComponent[].class, visitor.getVariableType()); + assertEquals(UIComponent[].class, visitor.getVariableType().getRawType()); } @Test public void testMethodReturnArrayElement() throws Exception { parseExpression("#{action.array[0]}"); assertEquals("action.getArray()[0]", visitor.getParsedExpression()); - assertEquals(UIComponent.class, visitor.getVariableType()); + assertEquals(UIComponent.class, visitor.getVariableType().getRawType()); } @Test @@ -403,18 +403,18 @@ parseExpression("#{action.count(123)}"); assertEquals("action.count(123)", visitor.getParsedExpression()); - assertEquals(Integer.class, visitor.getVariableType()); + assertEquals(Integer.class, visitor.getVariableType().getRawType()); parseExpression("#{action.count(clientId)}"); assertEquals("action.count(clientId)", visitor.getParsedExpression()); - assertEquals(Object.class, visitor.getVariableType()); + assertEquals(Object.class, visitor.getVariableType().getRawType()); } @Test public void testEmpty() throws Exception { parseExpression("#{empty action.array}"); assertEquals("this.getUtils().isEmpty(action.getArray())", visitor.getParsedExpression()); - assertEquals(Boolean.TYPE, visitor.getVariableType()); + assertEquals(Boolean.TYPE, visitor.getVariableType().getRawType()); } @Test @@ -428,18 +428,18 @@ public void testLiteralWithDeferred() throws Exception { parseExpression("#{1}#{2}"); assertEquals("convertToString(1) + convertToString(2)", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); parseExpression("abs #{getType()}"); assertEquals("\"abs \" + convertToString(this.getType())", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test public void testLiteralWithDeferred2() throws Exception { parseExpression("#{getType()} abs "); assertEquals("convertToString(this.getType()) + \" abs \"", visitor.getParsedExpression()); - assertEquals(String.class, visitor.getVariableType()); + assertEquals(String.class, visitor.getVariableType().getRawType()); } @Test @@ -463,7 +463,7 @@ public void testNonExistingMethod() throws Exception { parseExpression("#{action.doSomething(clientId, 123)}"); assertEquals("action.doSomething(clientId,123)", visitor.getParsedExpression()); - assertEquals(Object.class, visitor.getVariableType()); + assertEquals(Object.class, visitor.getVariableType().getRawType()); } @Test @@ -481,18 +481,19 @@ public void testWrongExpression2() throws Exception { parseExpression("#{action.property}"); assertEquals("action.getProperty()", visitor.getParsedExpression()); - assertEquals(Object.class, visitor.getVariableType()); + assertEquals(Object.class, visitor.getVariableType().getRawType()); } private void parseExpression(String expression) throws ParsingException { Map<String, Type> contextMap = new HashMap<String, Type>(); - contextMap.put("action", org.richfaces.cdk.parser.el.test.Bean.class); - contextMap.put("clientId", String.class); - contextMap.put("test", boolean.class); - contextMap.put("otherTest", boolean.class); - contextMap.put("this", Object.class); - contextMap.put("objectVar", Object.class); + contextMap.put("action", TypesFactory.getType(org.richfaces.cdk.parser.el.test.Bean.class)); + contextMap.put("clientId", TypesFactory.getType(String.class)); + contextMap.put("test", TypesFactory.getType(boolean.class)); + contextMap.put("otherTest", TypesFactory.getType(boolean.class)); + contextMap.put("this", TypesFactory.getType(Object.class)); + contextMap.put("super", TypesFactory.getType(Object.class)); + contextMap.put("objectVar", TypesFactory.getType(Object.class)); visitor.parse(expression, contextMap); } Deleted: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypeUtilsTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypeUtilsTest.java 2009-12-16 15:50:42 UTC (rev 16153) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypeUtilsTest.java 2009-12-16 15:51:57 UTC (rev 16154) @@ -1,128 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.cdk.parser.el.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import java.lang.reflect.Type; -import java.util.List; -import java.util.Map; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.richfaces.cdk.parser.el.ELParserUtils; - -/** - * @author Nick Belaevski - * @since 4.0 - */ -public class TypeUtilsTest { - - public static final class PropertyClass { - - public String getString() { - return null; - } - - public Integer[] getIntegerArray() { - return null; - } - - public Map<String, Object> getParameterizedMap() { - return null; - } - - public List<Float> getParameterizedList() { - return null; - } - - @SuppressWarnings("unchecked") - public Map getRawMap() { - return null; - } - - @SuppressWarnings("unchecked") - public List getRawList() { - return null; - } - } - - private Type stringType; - - private Type integerArrayType; - - private Type parameterizedMapType; - - private Type parameterizedListType; - - private Type rawMapType; - - private Type rawListType; - - @Before - public void setUp() throws Exception { - stringType = PropertyClass.class.getMethod("getString") - .getGenericReturnType(); - integerArrayType = PropertyClass.class.getMethod("getIntegerArray") - .getGenericReturnType(); - parameterizedMapType = PropertyClass.class.getMethod( - "getParameterizedMap").getGenericReturnType(); - parameterizedListType = PropertyClass.class.getMethod( - "getParameterizedList").getGenericReturnType(); - rawMapType = PropertyClass.class.getMethod("getRawMap") - .getGenericReturnType(); - rawListType = PropertyClass.class.getMethod("getRawList") - .getGenericReturnType(); - } - - @After - public void tearDown() { - stringType = null; - integerArrayType = null; - parameterizedMapType = null; - parameterizedListType = null; - rawMapType = null; - rawListType = null; - } - - @Test - public void testGetRawType() throws Exception { - assertEquals(String.class, ELParserUtils.getRawType(stringType)); - assertEquals(Integer[].class, ELParserUtils.getRawType(integerArrayType)); - assertEquals(Map.class, ELParserUtils.getRawType(parameterizedMapType)); - assertEquals(List.class, ELParserUtils.getRawType(parameterizedListType)); - assertEquals(Map.class, ELParserUtils.getRawType(rawMapType)); - assertEquals(List.class, ELParserUtils.getRawType(rawListType)); - } - - @Test - public void testGetActualTypeArguments() throws Exception { - assertNull(ELParserUtils.getLastTypeArgument(stringType)); - assertNull(ELParserUtils.getLastTypeArgument(integerArrayType)); - assertEquals(Object.class, ELParserUtils.getLastTypeArgument(parameterizedMapType)); - assertEquals(Float.class, ELParserUtils.getLastTypeArgument(parameterizedListType)); - assertNull(ELParserUtils.getLastTypeArgument(rawMapType)); - assertNull(ELParserUtils.getLastTypeArgument(rawListType)); - } -} Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/TypesFactoryTest.java 2009-12-16 15:51:57 UTC (rev 16154) @@ -0,0 +1,257 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.io.Writer; +import java.util.List; +import java.util.Map; + +import org.junit.Test; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; + + +/** + * @author Nick Belaevski + * + */ +public class TypesFactoryTest { + + private static final class ParameterizedTypesHolder { + + @SuppressWarnings("unused") + public Map<String, Object> getMap() { + return null; + } + + @SuppressWarnings("unused") + public List<String>[] getArray() { + return null; + } + + @SuppressWarnings("unused") + public List<? extends String> getWildcardList() { + return null; + } + + @SuppressWarnings("unused") + public <Abc> Abc getTypeVariableList() { + return null; + } + } + + private java.lang.reflect.Type getParameterizedMapType() throws Exception { + return ParameterizedTypesHolder.class.getMethod("getMap").getGenericReturnType(); + } + + private java.lang.reflect.Type getParameterizedArrayType() throws Exception { + return ParameterizedTypesHolder.class.getMethod("getArray").getGenericReturnType(); + } + + private java.lang.reflect.Type getWildcardType() throws Exception { + return ParameterizedTypesHolder.class.getMethod("getWildcardList").getGenericReturnType(); + } + + private java.lang.reflect.Type getTypeVariableType() throws Exception { + return ParameterizedTypesHolder.class.getMethod("getTypeVariableList").getGenericReturnType(); + } + + @Test + public void testGetNullType() throws Exception { + Type nullType = TypesFactory.getNullType(); + assertNotNull(nullType); + assertTrue(nullType.isNullType()); + } + + @Test + public void testGetTypeFromReflectionType() throws Exception { + Type integerType = TypesFactory.getType(Integer.TYPE); + assertNotNull(integerType); + assertEquals(Integer.TYPE, integerType.getRawType()); + assertNull(integerType.getTypeArguments()); + assertFalse(integerType.isArray()); + assertFalse(integerType.isNullType()); + + Type stringType = TypesFactory.getType(String.class); + assertNotNull(stringType); + assertEquals(String.class, stringType.getRawType()); + assertNull(stringType.getTypeArguments()); + assertFalse(stringType.isArray()); + assertFalse(stringType.isNullType()); + + Type arrayType = TypesFactory.getType(String[].class); + assertNotNull(arrayType); + assertNull(arrayType.getTypeArguments()); + assertTrue(arrayType.isArray()); + assertEquals(String.class, arrayType.getContainerType().getRawType()); + assertFalse(arrayType.isNullType()); + + Type multiDimArrayType = TypesFactory.getType(String[][][].class); + assertNotNull(multiDimArrayType); + assertNull(multiDimArrayType.getTypeArguments()); + assertTrue(multiDimArrayType.isArray()); + assertEquals(String[][].class, multiDimArrayType.getContainerType().getRawType()); + assertFalse(multiDimArrayType.isNullType()); + + Type parameterizedMapType = TypesFactory.getType(getParameterizedMapType()); + assertNotNull(parameterizedMapType); + assertFalse(parameterizedMapType.isArray()); + assertEquals(Map.class, parameterizedMapType.getRawType()); + + Type[] parameterizedMapTypeArguments = parameterizedMapType.getTypeArguments(); + assertNotNull(parameterizedMapTypeArguments); + assertEquals(2, parameterizedMapTypeArguments.length); + assertEquals(String.class, parameterizedMapTypeArguments[0].getRawType()); + assertEquals(Object.class, parameterizedMapTypeArguments[1].getRawType()); + + Type parameterizedArrayType = TypesFactory.getType(getParameterizedArrayType()); + assertNotNull(parameterizedArrayType); + assertTrue(parameterizedArrayType.isArray()); + assertEquals(List[].class, parameterizedArrayType.getRawType()); + + Type[] parameterizedArrayTypeArguments = parameterizedArrayType.getTypeArguments(); + assertNotNull(parameterizedArrayTypeArguments); + assertEquals(1, parameterizedArrayTypeArguments.length); + Type parameterizedArrayTypeArgument = parameterizedArrayTypeArguments[0]; + assertEquals(String.class, parameterizedArrayTypeArgument.getRawType()); + assertFalse(parameterizedArrayTypeArgument.isArray()); + + Type typeVariableType = TypesFactory.getType(getTypeVariableType()); + + assertNotNull(typeVariableType); + assertEquals("Abc", typeVariableType.getCode()); + + Type wildcardTypeHolder = TypesFactory.getType(getWildcardType()); + assertNotNull(wildcardTypeHolder); + assertEquals(List.class, wildcardTypeHolder.getRawType()); + + Type[] wildcardTypeHolderArguments = wildcardTypeHolder.getTypeArguments(); + assertNotNull(wildcardTypeHolderArguments); + assertEquals(1, wildcardTypeHolderArguments.length); + Type wildcardType = wildcardTypeHolderArguments[0]; + assertEquals("? extends java.lang.String", wildcardType.getCode()); + } + + @Test + public void testGetTypeFromString() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + + Type primitiveIntType = TypesFactory.getType("int", classLoader); + assertNotNull(primitiveIntType); + assertEquals(Integer.TYPE, primitiveIntType.getRawType()); + + Type guessedMapType = TypesFactory.getType("Map", classLoader); + assertNotNull(guessedMapType); + assertEquals(Map.class, guessedMapType.getRawType()); + assertNull(guessedMapType.getTypeArguments()); + + Type writerType = TypesFactory.getType(java.io.Writer.class.getName(), classLoader); + assertNotNull(writerType); + assertEquals(Writer.class, writerType.getRawType()); + assertNull(writerType.getTypeArguments()); + + Type genericMapType = TypesFactory.getType("Map<String, Object>", classLoader); + assertNotNull(genericMapType); + + assertEquals(Map.class, genericMapType.getRawType()); + Type[] genericMapTypeArguments = genericMapType.getTypeArguments(); + assertNotNull(genericMapTypeArguments); + assertFalse(genericMapType.isArray()); + assertEquals(2, genericMapTypeArguments.length); + + Type genericMapTypeKeyArgument = genericMapTypeArguments[0]; + assertEquals(String.class, genericMapTypeKeyArgument.getRawType()); + + Type genericMapTypeValueArgument = genericMapTypeArguments[1]; + assertEquals(Object.class, genericMapTypeValueArgument.getRawType()); + + Type arrayType = TypesFactory.getType("String[]", classLoader); + assertNotNull(arrayType); + assertTrue(arrayType.isArray()); + assertEquals(String[].class, arrayType.getRawType()); + + Type genericArrayType = TypesFactory.getType("List<String>[]", classLoader); + assertNotNull(genericArrayType); + assertTrue(genericArrayType.isArray()); + assertEquals(List[].class, genericArrayType.getRawType()); + + Type[] genericArrayTypeArguments = genericArrayType.getTypeArguments(); + assertNotNull(genericArrayTypeArguments); + assertEquals(1, genericArrayTypeArguments.length); + + Type genericArrayTypeArgument = genericArrayTypeArguments[0]; + assertEquals(String.class, genericArrayTypeArgument.getRawType()); + } + + @Test + public void testCaching() throws Exception { + Type objectType = TypesFactory.getType(Object.class); + Type objectType2 = TypesFactory.getType(Object.class); + + assertNotNull(objectType); + assertNotNull(objectType2); + + assertSame(objectType, objectType2); + + TypesFactory.clearCaches(); + + Type objectType3 = TypesFactory.getType(Object.class); + assertNotNull(objectType3); + + assertNotSame(objectType, objectType3); + } + + @Test + public void testReferencedType() throws Exception { + ClassLoader classLoader = getClass().getClassLoader(); + String className = "some.not.available.Class"; + Type plainReferencedType = TypesFactory.getType(className, classLoader); + + assertNotNull(plainReferencedType); + assertEquals(className, plainReferencedType.getCode()); + + String arraySignature = className + "[]"; + Type arrayReferencedType = TypesFactory.getType(arraySignature, classLoader); + assertNotNull(arrayReferencedType); + assertTrue(arrayReferencedType.isArray()); + assertEquals(arraySignature, arrayReferencedType.getCode()); + + String genericSignature = className + "<String>"; + Type genericReferenceType = TypesFactory.getType(genericSignature, classLoader); + assertNotNull(genericReferenceType); + assertEquals(genericSignature, genericReferenceType.getCode()); + + Type[] genericTypeArguments = genericReferenceType.getTypeArguments(); + assertNotNull(genericTypeArguments); + assertEquals(1, genericTypeArguments.length); + Type genericTypeArgument = genericTypeArguments[0]; + assertEquals(String.class, genericTypeArgument.getRawType()); + } +}

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16153 - in root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk: apt and 8 other directories.

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

Author: nbelaevski Date: 2009-12-16 10:50:42 -0500 (Wed, 16 Dec 2009) New Revision: 16153 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/NullType.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java Log: https://jira.jboss.org/jira/browse/RF-7732 Fixed NPE in CDK Fixed CheckStyle errors in CDK Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkClassLoader.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -27,7 +27,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.util.Collection; import java.util.Set; import com.google.common.collect.ImmutableSet; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,14 +25,12 @@ package org.richfaces.cdk; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.MutableClassToInstanceMap; +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import org.richfaces.cdk.CdkContext.SourceType; -import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.generate.java.ComponentClassGenerator; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.templatecompiler.RendererClassGenerator; @@ -40,13 +38,12 @@ import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; import org.richfaces.cdk.xmlconfig.FacesConfigParser; -import java.io.File; -import java.io.IOException; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.MutableClassToInstanceMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that class with * tool-specific methods.</p> @@ -54,14 +51,7 @@ * */ public class CdkContextBase implements CdkContext { - private Map<String, String> options = Maps.newHashMap(); - private Map<SourceType, Iterable<File>> sources = Maps.newHashMap(); - private Map<OutputType, File> outputs = Maps.newHashMap(); - private Map<SourceType, Iterable<File>> inputFolders = Maps.newHashMap(); - private ClassToInstanceMap<CdkWorker> workers = MutableClassToInstanceMap.create(); - private List<CdkProcessingException> errors = Lists.newArrayList(); - private final CdkClassLoader loader; - private ComponentLibrary library; + /* Map contains writer classes for standard outputs. */ static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS = @@ -77,6 +67,15 @@ FacesConfigParser.class).put(StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class).build(); + private Map<String, String> options = Maps.newHashMap(); + private Map<SourceType, Iterable<File>> sources = Maps.newHashMap(); + private Map<OutputType, File> outputs = Maps.newHashMap(); + private Map<SourceType, Iterable<File>> inputFolders = Maps.newHashMap(); + private ClassToInstanceMap<CdkWorker> workers = MutableClassToInstanceMap.create(); + private List<CdkProcessingException> errors = Lists.newArrayList(); + private final CdkClassLoader loader; + private ComponentLibrary library; + public CdkContextBase(CdkClassLoader loader) { this.loader = loader; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/DummyBuilder.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,7 +25,6 @@ package org.richfaces.cdk; -import org.richfaces.cdk.model.ComponentLibrary; /** * <p class="changed_added_4_0">This is dummy model builder class for not yet implemented source types</p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ModelBuilder.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,27 +21,32 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk; -import org.richfaces.cdk.model.ComponentLibrary; - /** - * <p class="changed_added_4_0">Interface for {@link ComponentLibrary} model builder.</p> + * <p class="changed_added_4_0"> + * Interface for {@link org.richfaces.cdk.model.ComponentLibrary.ComponentLibrary} model builder. + * </p> + * * @author asmirnov(a)exadel.com - * + * */ public interface ModelBuilder extends CdkWorker { /** - * <p class="changed_added_4_0">Initialize builder.</p> + * <p class="changed_added_4_0"> + * Initialize builder. + * </p> + * * @param context */ public void init(CdkContext context); /** - * <p class="changed_added_4_0">Build library model.</p> + * <p class="changed_added_4_0"> + * Build library model. + * </p> + * * @throws CdkException */ public void build() throws CdkException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -27,10 +27,6 @@ import java.io.File; import java.io.IOException; - -import java.net.URL; -import java.net.URLClassLoader; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -38,7 +34,6 @@ import java.util.Locale; import javax.annotation.processing.Processor; - import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaCompiler; @@ -53,13 +48,10 @@ import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; -import org.richfaces.cdk.LibraryBuilder; import org.richfaces.cdk.Logger; import org.richfaces.cdk.LoggerFactory; -import org.richfaces.cdk.ModelBuilder; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.model.ComponentLibrary; import com.google.common.collect.Lists; @@ -111,16 +103,16 @@ StandardJavaFileManager stdFileManager = javaCompiler.getStandardFileManager(null, null, null); try { - stdFileManager.setLocation(StandardLocation.CLASS_PATH, classPathLoader.getFiles()); - File outputFolder = context.getOutputFolder(StandardOutputs.COMPONENT_CLASSES); - if (null != outputFolder) { - stdFileManager.setLocation(StandardLocation.SOURCE_OUTPUT,Collections.singleton(outputFolder)); - } - Iterable<File> sourceFolders = context.getSourceFolders(StandardSources.JAVA_SOURCES); + stdFileManager.setLocation(StandardLocation.CLASS_PATH, classPathLoader.getFiles()); + File outputFolder = context.getOutputFolder(StandardOutputs.COMPONENT_CLASSES); + if (null != outputFolder) { + stdFileManager.setLocation(StandardLocation.SOURCE_OUTPUT,Collections.singleton(outputFolder)); + } + Iterable<File> sourceFolders = context.getSourceFolders(StandardSources.JAVA_SOURCES); - if (null != sourceFolders && sourceFolders.iterator().hasNext()) { - stdFileManager.setLocation(StandardLocation.SOURCE_PATH, sourceFolders); - } + if (null != sourceFolders && sourceFolders.iterator().hasNext()) { + stdFileManager.setLocation(StandardLocation.SOURCE_PATH, sourceFolders); + } } catch (IOException e) { throw new CdkException(e); } @@ -160,15 +152,15 @@ Iterable<? extends JavaFileObject> sourceObjects = getFileManager().getJavaFileObjectsFromFiles(sources); - CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, - sourceObjects); + CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null, + sourceObjects); - task.setProcessors(Arrays.asList(processors)); - task.setLocale(locale); + task.setProcessors(Arrays.asList(processors)); + task.setLocale(locale); - if (!task.call()) { - throw new AptException("Compilation error: " + messages); - } + if (!task.call()) { + throw new AptException("Compilation error: " + messages); + } } /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,40 +25,29 @@ package org.richfaces.cdk.apt; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; +import java.lang.annotation.Annotation; +import java.util.Collections; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.faces.component.FacesComponent; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.CdkWorker; -import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.annotations.Behavior; import org.richfaces.cdk.annotations.Component; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.InvalidNameException; import org.richfaces.cdk.util.Pair; -import org.richfaces.cdk.util.PropertyUtils; -import org.richfaces.cdk.xmlconfig.FragmentParser; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.faces.component.FacesComponent; +import com.google.common.collect.ImmutableList; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; - -import java.lang.annotation.Annotation; - -import java.util.Collections; -import java.util.List; -import java.util.Set; - /** * <p class="changed_added_4_0"> * Base class for all CDK Annotation processors. That class provides access to @@ -69,13 +58,13 @@ * */ public class CdkProcessor extends AbstractProcessor implements CdkWorker { - + private static final Set<String> ANY_ANNOTATION = Collections.singleton("*"); - private static final ImmutableList<Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>>> processors = ImmutableList - .of(Pair.of(Component.class, ComponentProcessor.class), - Pair.of(FacesComponent.class, FacesComponentProcessor.class), - Pair.of(Behavior.class, BehaviorProcessor.class)); + private static final ImmutableList<Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>>> PROCESSORS = ImmutableList + .of(Pair.of(Component.class, ComponentProcessor.class), + Pair.of(FacesComponent.class, FacesComponentProcessor.class), + Pair.of(Behavior.class, BehaviorProcessor.class)); /** * <p class="changed_added_4_0"> @@ -96,7 +85,7 @@ this.context = context; } - + @Override public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { SourceUtils sourceUtils = new SourceUtils(this.processingEnv,roundEnv); @@ -104,7 +93,7 @@ getContext().setWorker(SourceUtils.class, sourceUtils); if(!roundEnv.processingOver()){ // Process annotations. - for (Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>> process : processors) { + for (Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>> process : PROCESSORS) { processAnnotation(process.getFirst(), process.getSecond()); } // parse non-java sources @@ -136,7 +125,7 @@ protected void sendError(TypeElement componentElement, CdkProcessingException e) { // rise error and continue. processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), - componentElement); + componentElement); getContext().sendError(e); } /** @@ -148,7 +137,7 @@ protected CdkContext getContext() { return context; } - + @Override public Set<String> getSupportedAnnotationTypes() { return ANY_ANNOTATION; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,12 +25,35 @@ package org.richfaces.cdk.apt; -import com.google.common.collect.Lists; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.faces.event.FacesEvent; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.MirroredTypesException; +import javax.lang.model.type.TypeMirror; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.NamingConventions; -import org.richfaces.cdk.annotations.*; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.Attributes; +import org.richfaces.cdk.annotations.Component; +import org.richfaces.cdk.annotations.DefaultValue; +import org.richfaces.cdk.annotations.DisplayName; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.EventNames; +import org.richfaces.cdk.annotations.Facet; +import org.richfaces.cdk.annotations.Facets; +import org.richfaces.cdk.annotations.Family; +import org.richfaces.cdk.annotations.Fires; +import org.richfaces.cdk.annotations.Generate; +import org.richfaces.cdk.annotations.Icon; +import org.richfaces.cdk.annotations.Signature; +import org.richfaces.cdk.annotations.SuggestedValue; import org.richfaces.cdk.apt.SourceUtils.BeanProperty; import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor; import org.richfaces.cdk.model.ClassDescription; @@ -42,21 +65,8 @@ import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; +import com.google.common.collect.Lists; -import javax.faces.event.FacesEvent; - -import javax.lang.model.element.*; -import javax.lang.model.type.MirroredTypesException; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; - -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - /** * <p class="changed_added_4_0">That class process component-related annotations such as {@link Component} or * {@link javax.faces.component.FacesComponent} and stores information in model. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -40,12 +40,10 @@ import javax.lang.model.util.ElementFilter; import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.model.InvalidNameException; import org.richfaces.cdk.util.PropertyUtils; -import com.google.common.base.Function; import com.google.common.collect.Sets; /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -26,8 +26,6 @@ package org.richfaces.cdk.freemarker; import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -37,14 +35,11 @@ import org.richfaces.cdk.model.Property; import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import com.google.common.collect.Sets; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; - import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; @@ -135,7 +130,7 @@ private TemplateModel attributes() throws TemplateModelException { ArrayList<PropertyModel> models = new ArrayList<PropertyModel>(); for (Map.Entry<String, Property> entry : component.getAttributes().entrySet()) { - models.add(new PropertyModel(entry.getKey(), entry.getValue(), wrapper)); + models.add(new PropertyModel(entry.getKey(), entry.getValue(), wrapper)); } return wrapper.wrap(models); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,15 +25,13 @@ package org.richfaces.cdk.freemarker; -import freemarker.ext.beans.BeansWrapper; +import org.richfaces.cdk.model.Component; +import freemarker.ext.beans.BeansWrapper; import freemarker.template.ObjectWrapper; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; -import org.richfaces.cdk.model.Component; -import org.richfaces.cdk.model.Property; - /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -28,12 +28,9 @@ import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; - import java.io.Serializable; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; - import java.util.Collection; import java.util.Map; import java.util.NoSuchElementException; @@ -45,9 +42,6 @@ import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.RenderKit.Id; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - /** * <p class="changed_added_4_0"> * That class contains model of all JSF components asscoiated with that project @@ -81,9 +75,9 @@ * </p> */ private final ModelMap<RenderKit.Id,RenderKit> renderKits = ModelMap.<RenderKit.Id,RenderKit>create(); - + private final ModelCollection<Converter> converters = ModelCollection.<Converter>create(); - + private final ModelCollection<Validator> validators = ModelCollection.<Validator>create(); private final ModelCollection<Listener> listeners = ModelCollection.<Listener>create(); private long lastModified = Long.MIN_VALUE; @@ -96,7 +90,7 @@ private final ModelCollection<Event> events = ModelCollection.<Event>create(); private final ModelCollection<Behavior> behaviors = ModelCollection.<Behavior>create(); - + private ConfigExtension extension; /** @@ -139,7 +133,7 @@ */ public RenderKit addRenderKit(String renderKitId) { RenderKit.Id renderKitType = new RenderKit.Id(renderKitId); - + RenderKit renderKit = renderKits.get(renderKitType); if(null == renderKit){ @@ -254,13 +248,13 @@ static <T extends ModelElement<T>> void merge(Collection<T> target, Collection<T> source) { for (T element : source) { T targetElement = null; - + try { // TODO - lookup for equivalent element in target collection. -// find(target, element.getKey()); + // find(target, element.getKey()); } catch (NoSuchElementException e) { - // TODO: handle exception - } + // TODO: handle exception + } if (null == targetElement) { target.add(element); @@ -304,7 +298,7 @@ } static <R, P, T extends ModelElement<T>> R accept(Iterable<T> components, LibraryVisitor<R, P> visitor, P param, - R result) throws CdkException { + R result) throws CdkException { if (null == result) { for (T t : components) { R accept = t.accept(visitor, param); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelCollection.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,13 +25,13 @@ package org.richfaces.cdk.model; -import org.richfaces.cdk.CdkException; - import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import org.richfaces.cdk.CdkException; + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -45,10 +45,10 @@ * */ public class ModelCollection<E extends ModelElement<? super E>> - implements Collection<E>, Visitable { - + implements Collection<E>, Visitable { + private final List<E> elements = Lists.newArrayList(); - + public static <T extends ModelElement<? super T>> ModelCollection<T> create(){ return new ModelCollection<T>(); } @@ -128,7 +128,7 @@ @Override public boolean retainAll(Collection<?> c) { - return elements.retainAll(c); + return elements.retainAll(c); } @Override Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELParserUtils.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -29,19 +29,15 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; -import java.util.WeakHashMap; import org.jboss.el.parser.AstAnd; import org.jboss.el.parser.AstBracketSuffix; @@ -96,6 +92,7 @@ import org.richfaces.cdk.parser.el.node.BinaryBooleanOperationTreeNode; import org.richfaces.cdk.parser.el.node.ConstantValueTreeNode; import org.richfaces.cdk.parser.el.node.ITreeNode; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * Class, that encapsulate all functionality, related to Reflection calls, such as loading classes, get property @@ -152,14 +149,10 @@ } private static Map<Class<?>, ClassDataHolder> classDataCache = - new WeakHashMap<Class<?>, ClassDataHolder>(); + Collections.synchronizedMap(new HashMap<Class<?>, ClassDataHolder>()); private ELParserUtils() { } - public static void verifyClassPropertiesAndMethods(Class<?> initialClass) throws ParsingException { - resolveClassPropertiesAndMethods(initialClass); - } - private static ClassDataHolder resolveClassPropertiesAndMethods(Class<?> initialClass) throws ParsingException { ClassDataHolder classDataHolder = classDataCache.get(initialClass); if (classDataHolder == null) { @@ -273,25 +266,6 @@ } /** - * Returns wrapper classes for passed-in class. If type is primitive, then corresponding - * wrapper class is returned (e.g. boolean -> Boolean), otherwise does nothing and returns - * passed-in class. - * - * @return wrapper for primitive types, or passed-in class - */ - private static Class<?> getWrapperClass(Class<?> inClazz) { - if (inClazz == null) { - return null; - } - - if (inClazz.isPrimitive()) { - return getPrimitiveWrapper(inClazz); - } else { - return inClazz; - } - } - - /** * <p>Retrieve the property descriptors for the specified class, * introspecting and caching them the first time a particular bean class * is encountered.</p> @@ -361,7 +335,7 @@ Type[] parameterTypes) throws ParsingException { if (clazz == null) { - return Object.class; + return TypesFactory.getType(Object.class); } ClassDataHolder classDataHolder = resolveClassPropertiesAndMethods(clazz); @@ -370,8 +344,6 @@ // search through all methods int paramSize = parameterTypes.length; Method bestMatch = null; - float bestMatchCost = Float.MAX_VALUE; - float myCost = Float.MAX_VALUE; for (Method resolvedMethod: resolvedMethods) { if (!isMethodVisible(resolvedMethod)) { @@ -383,14 +355,14 @@ } // compare parameters - Class<?>[] methodsParams = resolvedMethod.getParameterTypes(); + Type[] methodsParams = TypesFactory.getTypesArray(resolvedMethod.getParameterTypes()); int methodParamSize = methodsParams.length; if (methodParamSize == paramSize) { boolean match = true; for (int n = 0; n < methodParamSize; n++) { - if (!isAssignmentCompatible(methodsParams[n], parameterTypes[n])) { + if (!methodsParams[n].isAssignableFrom(parameterTypes[n])) { match = false; break; @@ -398,181 +370,21 @@ } if (match) { - myCost = getTotalTransformationCost(methodsParams, parameterTypes); - - if (myCost < bestMatchCost) { - bestMatch = resolvedMethod; - bestMatchCost = myCost; - } + //TODO handle overriden methods + bestMatch = resolvedMethod; + break; } } } if (bestMatch != null) { - return bestMatch.getGenericReturnType(); + return TypesFactory.getType(bestMatch.getGenericReturnType()); } else { - return Object.class; + return TypesFactory.getType(Object.class); } } - /** - * Returns the sum of the object transformation cost for each class in the source - * argument list. - * @param srcArgs The source arguments - * @param destArgs The destination arguments - * @return The total transformation cost - */ - private static float getTotalTransformationCost(Type[] destArgs, Type[] srcArgs) { - float totalCost = 0.0f; - for (int i = 0; i < srcArgs.length; i++) { - Type destType = destArgs[i]; - Type srcType = srcArgs[i]; - - totalCost += getObjectTransformationCost(destType, srcType); - } - - return totalCost; - } - - private static Set<Class<?>> getAllInterfaces(Class<?> clazz) throws ParsingException { - final Set<Class<?>> result = new LinkedHashSet<Class<?>>(); - - new ClassWalkingLogic(clazz).walk(new ClassVisitor() { - - @Override - public void visit(Class<?> clazz) throws ParsingException { - if (clazz.isInterface()) { - result.add(clazz); - } - } - - }); - - return result; - } - - /** - * Gets the number of steps required needed to turn the source class into the - * destination class. This represents the number of steps in the object hierarchy - * graph. - * @param srcClass The source class - * @param destClass The destination class - * @return The cost of transforming an object - */ - private static float getObjectTransformationCost(Type destType, Type srcType) { - float cost = 0.0f; - - //no need to check if destType is primitive because the check has already been done - //by isAssignmentCompatible() method - if (isNullType(srcType)) { - return cost; - } - - Class<?> srcClass = getWrapperClass(getRawType(srcType)); - Class<?> destClass = getWrapperClass(getRawType(destType)); - if (srcClass != null && !srcClass.equals(destClass)) { - boolean interfaceMatched = false; - try { - Set<Class<?>> interfaces = getAllInterfaces(srcClass); - for (Class<?> iface : interfaces) { - if (isAssignmentCompatible(destClass, iface)) { - // slight penalty for interface match. - // we still want an exact match to override an interface match, but - // an interface match should override anything where we have to get a - // superclass. - cost += 0.25f; - interfaceMatched = true; - - break; - } - } - } catch (ParsingException e) { - // TODO: handle exception - } - - if (!interfaceMatched) { - while (srcClass != null && !srcClass.equals(destClass)) { - cost++; - srcClass = srcClass.getSuperclass(); - } - - /* - * If the destination class is null, we've travelled all the way up to - * an Object match. We'll penalize this by adding 1.5 to the cost. - */ - if (srcClass == null) { - cost += 1.5f; - } - } - } - - - return cost; - } - - /** - * <p>Determine whether a type can be used as a parameter in a method invocation. - * This method handles primitive conversions correctly.</p> - * - * <p>In order words, it will match a <code>Boolean</code> to a <code>boolean</code>, - * a <code>Long</code> to a <code>long</code>, - * a <code>Float</code> to a <code>float</code>, - * a <code>Integer</code> to a <code>int</code>, - * and a <code>Double</code> to a <code>double</code>. - * Now logic widening matches are allowed. - * For example, a <code>Long</code> will not match a <code>int</code>. - * - * @param parameterType the type of parameter accepted by the method - * @param parameterization the type of parameter being tested - * - * @return true if the assignement is compatible. - */ - public static boolean isAssignmentCompatible(Type parameterType, Type parameterization) { - Class<?> parameterClass = getRawType(parameterType); - - if (isNullType(parameterization)) { - //null value can be assigned to any class except primitive - return !parameterClass.isPrimitive(); - } else { - Class<?> parameterWrappedClass = getWrapperClass(parameterClass); - Class<?> parameterizationWrappedClass = getWrapperClass(getRawType(parameterization)); - return parameterWrappedClass.isAssignableFrom(parameterizationWrappedClass); - } - } - - /** - * Gets the wrapper object class for the given primitive type class. - * For example, passing <code>boolean.class</code> returns <code>Boolean.class</code> - * @param primitiveType the primitive type class for which a match is to be found - * @return the wrapper type associated with the given primitive - * or null if no match is found - */ - private static Class<?> getPrimitiveWrapper(Class<?> primitiveType) { - - // does anyone know a better strategy than comparing names? - if (boolean.class.equals(primitiveType)) { - return Boolean.class; - } else if (float.class.equals(primitiveType)) { - return Float.class; - } else if (long.class.equals(primitiveType)) { - return Long.class; - } else if (int.class.equals(primitiveType)) { - return Integer.class; - } else if (short.class.equals(primitiveType)) { - return Short.class; - } else if (byte.class.equals(primitiveType)) { - return Byte.class; - } else if (double.class.equals(primitiveType)) { - return Double.class; - } else if (char.class.equals(primitiveType)) { - return Character.class; - } else { - throw new IllegalArgumentException( - MessageFormat.format("Type {0} is not primitive!", primitiveType.getName())); - } - } - interface ClassVisitor { public void visit(Class<?> clazz) throws ParsingException; } @@ -626,35 +438,8 @@ visitedClasses.clear(); } } - - public static boolean isNullType(Type type) { - return type instanceof NullType; + + public static void clearCaches() { + classDataCache.clear(); } - - public static Type getLastTypeArgument(Type type) { - //TODO: generic arrays support - Type[] actualTypeArguments = null; - if (type instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) type; - actualTypeArguments = parameterizedType.getActualTypeArguments(); - } - - if (actualTypeArguments != null && actualTypeArguments.length != 0) { - return actualTypeArguments[actualTypeArguments.length - 1]; - } else { - return null; - } - } - - public static Class<?> getRawType(Type type) { - //TODO: generic arrays support - if (type instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) type; - return (Class<?>) parameterizedType.getRawType(); - } else if (type instanceof Class<?>) { - return (Class<?>) type; - } else { - return null; - } - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,7 +21,6 @@ package org.richfaces.cdk.parser.el; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.AstCompositeExpression; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/NullType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/NullType.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/NullType.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.cdk.parser.el; - -import java.lang.reflect.Type; - -/** - * @author Nick Belaevski - */ -public final class NullType implements Type { - - public static final NullType INSTANCE = new NullType(); - - private NullType() { - } -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/Type.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el; + +import java.util.Collection; + +/** + * @author Nick Belaevski + * + */ +public interface Type { + + public String getCode(); + + public Collection<Class<?>> getImportsList(); + + public boolean isNullType(); + + public boolean isArray(); + + public Class<?> getRawType(); + + public Type getContainerType(); + + public Type[] getTypeArguments(); + + public boolean isAssignableFrom(Type anotherType); +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBinaryOperationTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,13 +21,13 @@ */ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * <p>Abstract class for all binary (having two operands) operation expression nodes</p> Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractMethodTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.node; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; +import org.richfaces.cdk.parser.el.ELParserUtils; +import org.richfaces.cdk.parser.el.ELVisitor; +import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; + +/** + * @author Nick Belaevski + * + */ +public abstract class AbstractMethodTreeNode extends AbstractTreeNode { + + private static final Type[] EMPTY_TYPES_ARRAY = new Type[0]; + + /** + * @param node + */ + public AbstractMethodTreeNode(Node node) { + super(node); + } + + protected void visitMethod(StringBuilder sb, Map<String, Type> context, ELVisitor visitor, String methodName) + throws ParsingException { + + Class<?> methodHolderClass = visitor.getVariableType().getRawType(); + List<Type> argumentTypes = new ArrayList<Type>(); + + sb.append(ELNodeConstants.DOT); + sb.append(methodName); + sb.append(ELNodeConstants.LEFT_BRACKET); + + int childrenCount = getChildrenCount(); + + for (int k = 0; k < childrenCount; k++) { + if (k != 0) { + sb.append(ELNodeConstants.COMMA); + } + String childOutput = getChildOutput(k, context, visitor); + sb.append(childOutput); + + // TODO: handle generic matches -? + argumentTypes.add(visitor.getVariableType()); + } + + sb.append(ELNodeConstants.RIGHT_BRACKET); + + Type returnType = ELParserUtils.getMatchingVisibleMethodReturnType(methodHolderClass, methodName, argumentTypes + .toArray(EMPTY_TYPES_ARRAY)); + + visitor.setVariableType(returnType); + } +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -19,34 +19,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; +import java.text.MessageFormat; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This abstract class implement some methods of ITreeNode interface to using in subclasses. - * + * * @author amarkhel - * + * */ public abstract class AbstractTreeNode implements ITreeNode { + private Node node; public AbstractTreeNode(Node node) { this.node = node; } - + /** - * Collects output from visiting child of the current node with the specified index and returns - * collected string. + * Collects output from visiting child of the current node with the specified index and returns collected string. * * @param childIndex * @param context @@ -54,19 +53,31 @@ * @return * @throws ParsingException */ - protected String getChildOutput(int childIndex, Map<String, Type> context, - ELVisitor visitor) throws ParsingException { - - StringBuilder sb = new StringBuilder(); - getChild(childIndex).visit(sb, context, visitor); - - return sb.toString(); + protected String getChildOutput(int childIndex, Map<String, Type> context, ELVisitor visitor) + throws ParsingException { + + StringBuilder sb = new StringBuilder(); + getChild(childIndex).visit(sb, context, visitor); + + return sb.toString(); } + protected Type getIdentifierFromContext(Map<String, Type> context, String identifierName) throws ParsingException { + Type identifierType = context.get(identifierName); + + if (identifierType == null) { + throw new ParsingException(MessageFormat.format( + "No type found in context for identifier ''{0}'', handling as generic Object", identifierName)); + } + + return identifierType; + } + /** * Return node of current wrapper. + * * @return instance of org.jboss.el.parser.Node - * + * */ public Node getNode() { return node; @@ -74,12 +85,17 @@ /** * Visit current node. Generate Java code, that represent current node. - * @param stringBuilder instance to collect information. - * @param context - context to resolve beans - * @param visitor - ELVisitor - * @throws ParsingException - if error occurred during parsing process. + * + * @param stringBuilder + * instance to collect information. + * @param context + * - context to resolve beans + * @param visitor + * - ELVisitor + * @throws ParsingException + * - if error occurred during parsing process. * @return instance of org.jboss.el.parser.Node - * + * */ public ITreeNode getChild(int index) throws ParsingException { Node childNode = getNode().jjtGetChild(index); @@ -95,20 +111,23 @@ /** * Returns count of children for this node + * * @return children count */ public int getChildrenCount() { - return getNode().jjtGetNumChildren(); + return getNode().jjtGetNumChildren(); } - + /** * Return child of wrapped node by specified index. Abstract operation to override in subclasses. - * @param index - index of child. - * @throws ParsingException - if error occurred(child not found). + * + * @param index + * - index of child. + * @throws ParsingException + * - if error occurred(child not found). * @return wrapper for child - * + * */ - public abstract void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) - throws ParsingException; - + public abstract void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException; + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,15 +21,14 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; -import java.util.List; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; -import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstBracketSuffix node. @@ -43,37 +42,25 @@ @Override public void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException { - Type lastVariableType = visitor.getVariableType(); - Class<?> rawType = ELParserUtils.getRawType(lastVariableType); - + Type variableType = visitor.getVariableType(); String suffixValue = getChildOutput(0, context, visitor); - if (rawType != null && rawType.isArray()) { + if (variableType.isArray()) { sb.append(ELNodeConstants.LEFT_SQUARE_BRACKET); sb.append(suffixValue); sb.append(ELNodeConstants.RIGHT_SQUARE_BRACKET); - - //TODO: support for generified arrays - visitor.setVariableType(rawType.getComponentType()); } else { - Type collectionValueType = null; - if (rawType != null && - (List.class.isAssignableFrom(rawType) || Map.class.isAssignableFrom(rawType))) { - - collectionValueType = ELParserUtils.getLastTypeArgument(lastVariableType); - } - - if (collectionValueType == null) { - collectionValueType = Object.class; - } - sb.append(ELNodeConstants.DOT); sb.append(ELNodeConstants.GET_FUNCTION); sb.append(ELNodeConstants.LEFT_BRACKET); sb.append(suffixValue); sb.append(ELNodeConstants.RIGHT_BRACKET); + } - visitor.setVariableType(collectionValueType); + Type containerType = variableType.getContainerType(); + if (containerType == null) { + containerType = TypesFactory.getType(Object.class); } + visitor.setVariableType(containerType); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,14 +23,13 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; -import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstChoice node. @@ -62,7 +61,7 @@ sb.append(ELNodeConstants.RIGHT_BRACKET); - if (!ELParserUtils.isNullType(correctConditionBranchType)) { + if (!correctConditionBranchType.isNullType()) { visitor.setVariableType(correctConditionBranchType); } else { visitor.setVariableType(incorrectConditionBranchType); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,14 +21,14 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstDeferredExpression node. @@ -57,7 +57,7 @@ if (visitor.isUseConversionToString()) { sb.append(ELNodeConstants.RIGHT_BRACKET); - visitor.setVariableType(String.class); + visitor.setVariableType(TypesFactory.getType(String.class)); } /* otherwise variableType will be set in child's visit invocation */ } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,14 +23,14 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstEmpty node. @@ -55,6 +55,6 @@ sb.append(ELNodeConstants.RIGHT_BRACKET); - visitor.setVariableType(Boolean.TYPE); + visitor.setVariableType(TypesFactory.getType(Boolean.TYPE)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,13 +23,14 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstFloatingPoint node. @@ -49,6 +50,6 @@ sb.append(getNode().getImage()); sb.append(ELNodeConstants.RIGHT_BRACKET); - visitor.setVariableType(Double.TYPE); + visitor.setVariableType(TypesFactory.getType(Double.TYPE)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,15 +23,15 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.AstFunction; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.util.Strings; /** * This class extend AbstractTreeNode and wrap AstFunction node. @@ -39,7 +39,8 @@ * @author amarkhel * */ -public class AstFunctionTreeNode extends AbstractTreeNode { +public class AstFunctionTreeNode extends AbstractMethodTreeNode { + public AstFunctionTreeNode(Node node) { super(node); } @@ -50,34 +51,19 @@ String functionPrefix = functionNode.getPrefix(); String functionName = functionNode.getLocalName(); - String variableName; - if (functionPrefix != null && functionPrefix.length() != 0) { - //TODO: this should be a property getter, not property name - //TODO: support "super" keyword - variableName = functionPrefix; + String identifierName; + if (!Strings.isEmpty(functionPrefix)) { + //TODO: this should be a property getter, not property name. NB: 'this' & 'super' keywords + identifierName = functionPrefix; } else { - variableName = ELNodeConstants.THIS_PREFIX; + identifierName = ELNodeConstants.THIS_PREFIX; } - sb.append(variableName); - visitor.setVariableType(context.get(variableName)); + sb.append(identifierName); + + Type identifierType = getIdentifierFromContext(context, identifierName); + visitor.setVariableType(identifierType); - sb.append(ELNodeConstants.DOT); - - sb.append(functionName); - sb.append(ELNodeConstants.LEFT_BRACKET); - - int childrenCount = getChildrenCount(); - - for (int i = 0; i < childrenCount; i++) { - if (i != 0) { - sb.append(ELNodeConstants.COMMA); - } - - String childOutput = getChildOutput(i, context, visitor); - sb.append(childOutput); - } - - sb.append(ELNodeConstants.RIGHT_BRACKET); + visitMethod(sb, context, visitor, functionName); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,12 +21,12 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstIdentifier node. @@ -34,21 +34,19 @@ * @author amarkhel */ public class AstIdentifierTreeNode extends AbstractTreeNode { + public AstIdentifierTreeNode(Node node) { super(node); } @Override public void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException { - String variableName = getNode().getImage(); + String identifierName = getNode().getImage(); - Type variableType = context.get(variableName); - if (variableType == null) { - throw new ParsingException("No instance found in context for identifier " + variableName); - } + Type identifierType = getIdentifierFromContext(context, identifierName); //TODO: implement variable mapper like "utils" -> "this.getUtils()" - visitor.setVariableType(variableType); - sb.append(variableName); + visitor.setVariableType(identifierType); + sb.append(identifierName); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIntegerTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,13 +23,13 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstInteger node. @@ -45,6 +45,6 @@ @Override public void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException { sb.append(getNode().getImage()); - visitor.setVariableType(Integer.TYPE); + visitor.setVariableType(TypesFactory.getType(Integer.TYPE)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,7 +23,6 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; @@ -31,6 +30,8 @@ import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.StringUtils; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstLiteral node. @@ -50,7 +51,7 @@ sb.append(StringUtils.getEscapedString(getNode().getImage())); sb.append(ELNodeConstants.QUOTE); - visitor.setVariableType(String.class); + visitor.setVariableType(TypesFactory.getType(String.class)); } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,26 +21,20 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELNodeConstants; -import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstMethodSuffix node. * * @author amarkhel */ -public class AstMethodSuffixTreeNode extends AbstractTreeNode { +public class AstMethodSuffixTreeNode extends AbstractMethodTreeNode { - private static final Type[] EMPTY_TYPES_ARRAY = new Type[0]; - public AstMethodSuffixTreeNode(Node node) { super(node); } @@ -49,31 +43,6 @@ public void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException { String methodName = getNode().getImage(); - Class<?> objectClass = ELParserUtils.getRawType(visitor.getVariableType()); - List<Type> argumentTypes = new ArrayList<Type>(); - - sb.append(ELNodeConstants.DOT); - sb.append(methodName); - sb.append(ELNodeConstants.LEFT_BRACKET); - - int childrenCount = getChildrenCount(); - - for (int k = 0; k < childrenCount; k++) { - if (k != 0) { - sb.append(ELNodeConstants.COMMA); - } - String childOutput = getChildOutput(k, context, visitor); - sb.append(childOutput); - - //TODO: handle generic matches -? - argumentTypes.add(visitor.getVariableType()); - } - - sb.append(ELNodeConstants.RIGHT_BRACKET); - - Type returnType = ELParserUtils.getMatchingVisibleMethodReturnType(objectClass, methodName, - argumentTypes.toArray(EMPTY_TYPES_ARRAY)); - - visitor.setVariableType(returnType); + visitMethod(sb, context, visitor, methodName); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,14 +23,13 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstNegative node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,13 +23,13 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstNot node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,7 +23,6 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Method; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; @@ -31,6 +30,8 @@ import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstPropertySuffix node. @@ -67,7 +68,7 @@ String propertyName = getNode().getImage(); Type variableType = visitor.getVariableType(); - Class<?> clazz = ELParserUtils.getRawType(variableType); + Class<?> clazz = variableType.getRawType(); String readMethodName; Type readMethodReturnType; @@ -75,10 +76,10 @@ Method readMethod = getReadMethod(clazz, propertyName); if (readMethod != null) { readMethodName = readMethod.getName(); - readMethodReturnType = readMethod.getGenericReturnType(); + readMethodReturnType = TypesFactory.getType(readMethod.getGenericReturnType()); } else { readMethodName = ELNodeConstants.GETTER_PREFIX + capitalize(propertyName); - readMethodReturnType = Object.class; + readMethodReturnType = TypesFactory.getType(Object.class); } visitor.setVariableType(readMethodReturnType); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,7 +23,6 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.AstString; @@ -32,6 +31,8 @@ import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.StringUtils; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * This class extend AbstractTreeNode and wrap AstString node. @@ -50,6 +51,6 @@ sb.append(StringUtils.getEscapedString(((AstString) getNode()).getString())); sb.append(ELNodeConstants.QUOTE); - visitor.setVariableType(String.class); + visitor.setVariableType(TypesFactory.getType(String.class)); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,12 +21,12 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * This class extend AbstractTreeNode and wrap AstValue node. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticIntegerOperationTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,9 +21,10 @@ */ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * @author Nick Belaevski @@ -45,7 +46,7 @@ @Override protected Type getOperationType(Type firstArgumentType, Type secondArgumentType) { - return Integer.TYPE; + return TypesFactory.getType(Integer.TYPE); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryArithmeticOperationTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,10 +21,9 @@ */ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; - import org.jboss.el.parser.Node; -import org.richfaces.cdk.parser.el.ELParserUtils; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * @author Nick Belaevski @@ -47,13 +46,15 @@ protected Type getOperationType(Type firstArgumentType, Type secondArgumentType) { - if (ELParserUtils.isAssignmentCompatible(firstArgumentType, Double.class) || - ELParserUtils.isAssignmentCompatible(secondArgumentType, Double.class)) { + Type doubleType = TypesFactory.getType(Double.class); + + if (doubleType.isAssignableFrom(firstArgumentType) || + doubleType.isAssignableFrom(secondArgumentType)) { - return Double.TYPE; + return TypesFactory.getType(Double.TYPE); } - return Integer.TYPE; + return TypesFactory.getType(Integer.TYPE); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryBooleanOperationTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,9 +21,9 @@ */ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; - import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * @author Nick Belaevski @@ -45,7 +45,7 @@ @Override protected Type getOperationType(Type firstArgumentType, Type secondArgumentType) { - return Boolean.TYPE; + return TypesFactory.getType(Boolean.TYPE); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,13 +21,13 @@ */ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.NullType; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * @author Nick Belaevski @@ -37,13 +37,13 @@ // XXX what class to use for null object: Void.class or null - special NullType be used public static final ConstantValueTreeNode NULL_NODE = new ConstantValueTreeNode(ELNodeConstants.NULL_VALUE, - NullType.INSTANCE); + TypesFactory.getNullType()); public static final ConstantValueTreeNode TRUE_NODE = new ConstantValueTreeNode(ELNodeConstants.TRUE_VALUE, - Boolean.TYPE); + TypesFactory.getType(Boolean.TYPE)); public static final ConstantValueTreeNode FALSE_NODE = new ConstantValueTreeNode(ELNodeConstants.FALSE_VALUE, - Boolean.TYPE); + TypesFactory.getType(Boolean.TYPE)); private final String value; @@ -64,7 +64,6 @@ */ @Override public void visit(StringBuilder sb, Map<String, Type> context, ELVisitor visitor) throws ParsingException { - sb.append(value); visitor.setVariableType(type); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ITreeNode.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,12 +21,12 @@ package org.richfaces.cdk.parser.el.node; -import java.lang.reflect.Type; import java.util.Map; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; /** * Interface for all wrappers of org.jboss.el.parser.Node class. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,18 +21,20 @@ */ package org.richfaces.cdk.templatecompiler; +import org.richfaces.cdk.parser.el.Type; + /** * @author Nick Belaevski */ public class DefineObjectStatement extends AbstractTemplateMethodBodyStatement { - private String type; + private Type type; private String name; private String initializationExpression; - public DefineObjectStatement(String type, String name, String initializationExpression) { + public DefineObjectStatement(Type type, String name, String initializationExpression) { super("define-object"); this.type = type; @@ -43,7 +45,7 @@ /** * @return the type */ - public String getType() { + public Type getType() { return type; } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/ParameterizedTypeImpl.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.templatecompiler; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Arrays; + +/** + * @author Nick Belaevski + * + */ +class ParameterizedTypeImpl implements ParameterizedType { + + private Type rawType; + + private Type[] actualTypeArguments; + + public ParameterizedTypeImpl(Type rawType, Type[] actualTypeArguments) { + super(); + this.rawType = rawType; + this.actualTypeArguments = actualTypeArguments; + } + + /* (non-Javadoc) + * @see java.lang.reflect.ParameterizedType#getActualTypeArguments() + */ + @Override + public Type[] getActualTypeArguments() { + return actualTypeArguments; + } + + /* (non-Javadoc) + * @see java.lang.reflect.ParameterizedType#getOwnerType() + */ + @Override + public Type getOwnerType() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see java.lang.reflect.ParameterizedType#getRawType() + */ + @Override + public Type getRawType() { + return rawType; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + Arrays.hashCode(actualTypeArguments); + result = prime * result + ((rawType == null) ? 0 : rawType.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + ParameterizedTypeImpl other = (ParameterizedTypeImpl) obj; + if (!Arrays.equals(actualTypeArguments, other.actualTypeArguments)) { + return false; + } + if (rawType == null) { + if (other.rawType != null) { + return false; + } + } else if (!rawType.equals(other.rawType)) { + return false; + } + return true; + } + +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -87,13 +87,19 @@ for (Renderer renderer : renderKit.getRenderers()) { Template template = renderer.getTemplate(); if (null != template) { - // TODO - put real parameters. RendererClassVisitor visitor = new RendererClassVisitor( template.getInterface(), context.getLoader()); - visitor.preProcess(); - template.getImplementation().visit(visitor); - visitor.postProcess(); - JavaClass javaClass = visitor.getRendererClass(); + + try { + // TODO - put real parameters. + visitor.preProcess(); + template.getImplementation().visit(visitor); + visitor.postProcess(); + } finally { + RendererClassVisitor.clearCaches(); + } + + JavaClass javaClass = visitor.getGeneratedClass(); String fullName = javaClass.getFullName(); File outFile = context.createOutputFile( StandardOutputs.RENDERER_CLASSES, fullName.replace( Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -26,7 +26,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; -import java.lang.reflect.Type; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -37,10 +36,8 @@ import javax.annotation.Generated; import javax.faces.component.UIComponent; -import javax.faces.component.behavior.Behavior; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import javax.faces.convert.Converter; import javax.faces.render.Renderer; import javax.xml.namespace.QName; @@ -52,8 +49,13 @@ import org.richfaces.builder.model.MethodBody; import org.richfaces.builder.model.MethodBodyStatementsContainer; import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.Logger; +import org.richfaces.cdk.LoggerFactory; +import org.richfaces.cdk.parser.el.ELParserUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.parser.el.types.TypesFactory; import org.richfaces.cdk.templatecompiler.model.AnyElement; import org.richfaces.cdk.templatecompiler.model.CdkBodyElement; import org.richfaces.cdk.templatecompiler.model.CdkCallElement; @@ -66,6 +68,7 @@ import org.richfaces.cdk.templatecompiler.model.CompositeInterface; import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.templatecompiler.model.TemplateVisitor; +import org.richfaces.cdk.util.Strings; import com.google.common.collect.Lists; @@ -89,6 +92,10 @@ */ static final String THIS_VARIABLE = "this"; /** + * + */ + static final String SUPER_VARIABLE = "super"; + /** * */ static final String FACES_CONTEXT_VARIABLE = "facesContext"; @@ -103,6 +110,8 @@ static final String RENDERER_UTILS_CLASS_NAME = "org.ajax4jsf.renderkit.RendererUtils"; + private static final Logger LOG = LoggerFactory.getLogger(); + private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>(); static { @@ -110,30 +119,11 @@ DEFAULT_NAMESPACES.add("http://www.w3.org/1999/xhtml"); } - private static final String[] GUESS_PACKAGES; - - static { - Class<?>[] guessPackagesClasses = { - UIComponent.class, - Behavior.class, - Converter.class, - FacesContext.class, - Collection.class, - Object.class - }; - - GUESS_PACKAGES = new String[guessPackagesClasses.length]; - int i = 0; - for (Class<?> guessPackageClass : guessPackagesClasses) { - GUESS_PACKAGES[i++] = guessPackageClass.getPackage().getName(); - } - } - private static final Map<String, Set<String>> ELEMENTS_ATTRIBUTES; protected MethodBodyStatementsContainer currentStatement; - private JavaClass rendererClass; + private JavaClass generatedClass; private CompositeInterface compositeInterface; private final LinkedList<MethodBodyStatementsContainer> statements = Lists.newLinkedList(); @@ -143,6 +133,8 @@ private boolean isAddedMethodForConversionToString; private boolean isAddedMethodForCheckingEmptiness; + private Type lastCompiledExpressionType; + static { InputStream serializedAttributesStream = RendererClassVisitor.class.getResourceAsStream("/META-INF/schema/attributes.ser"); @@ -173,19 +165,19 @@ } private void initializeJavaClass() { - this.rendererClass = createJavaClassByName(compositeInterface.getJavaClass()); - this.rendererClass.addModifier(JavaModifier.PUBLIC); - this.rendererClass.setSuperClass(createJavaClassByName(compositeInterface.getBaseClass())); + this.generatedClass = createJavaClassByName(compositeInterface.getJavaClass()); + this.generatedClass.addModifier(JavaModifier.PUBLIC); + this.generatedClass.setSuperClass(createJavaClassByName(compositeInterface.getBaseClass())); - this.rendererClass.addImport(FacesContext.class); - this.rendererClass.addImport(ResponseWriter.class); - this.rendererClass.addImport(UIComponent.class); - this.rendererClass.addImport(RENDERER_UTILS_CLASS_NAME); + this.generatedClass.addImport(FacesContext.class); + this.generatedClass.addImport(ResponseWriter.class); + this.generatedClass.addImport(UIComponent.class); + this.generatedClass.addImport(RENDERER_UTILS_CLASS_NAME); - this.rendererClass.addAnnotation(Generated.class, "\"RichFaces CDK\""); + this.generatedClass.addAnnotation(Generated.class, "\"RichFaces CDK\""); //TODO remove this after improving Java model - this.rendererClass.addImport(Generated.class); - + this.generatedClass.addImport(Generated.class); + this.createMethodContext(); } @@ -203,7 +195,7 @@ conversionMethod.setMethodBody(conversionMethodBody); conversionMethodBody.addStatement(new ConversionToStringMethodBodyStatement()); - rendererClass.addMethod(conversionMethod); + generatedClass.addMethod(conversionMethod); } } @@ -221,7 +213,7 @@ checkingMethod.setMethodBody(checkingMethodBody); checkingMethodBody.addStatement(new EmptinessCheckingMethodBodyStatement()); - rendererClass.addMethod(checkingMethod); + generatedClass.addMethod(checkingMethod); } } @@ -229,6 +221,8 @@ try { ELVisitor elVisitor = new ELVisitor(); elVisitor.parse(expression, localsTypesMap); + + lastCompiledExpressionType = elVisitor.getVariableType(); String parsedExpression = elVisitor.getParsedExpression(); if (elVisitor.isUseConversionToString()) { @@ -245,28 +239,11 @@ e.printStackTrace(); throw new RuntimeException(e.getMessage()); } -// -// if (Boolean.class.isAssignableFrom(type)) { -// //TODO just a stub! -// return "false /* " + expression.trim() + " */"; -// } -// -// return quote(expression) + " /* " + expression.trim() + " */"; } - private String getElExpressionContainerType(String value) { - // TODO Auto-generated method stub - return Object.class.getName(); - } - - private String getElExpressionType(String value) { - // TODO Auto-generated method stub - return String.class.getName(); - } - private boolean isDefaultNamespace(String namespaceURI) { //TODO - another namespaces - if (namespaceURI == null || namespaceURI.length() == 0) { + if (Strings.isEmpty(namespaceURI)) { return true; } @@ -280,14 +257,37 @@ private void createMethodContext() { this.currentStatement = new MethodBody(); this.localsTypesMap = new HashMap<String, Type>(); - localsTypesMap.put(FACES_CONTEXT_VARIABLE, FacesContext.class); - localsTypesMap.put(RESPONSE_WRITER_VARIABLE, ResponseWriter.class); - localsTypesMap.put(CLIENT_ID_VARIABLE, String.class); + localsTypesMap.put(FACES_CONTEXT_VARIABLE, TypesFactory.getType(FacesContext.class)); + localsTypesMap.put(RESPONSE_WRITER_VARIABLE, TypesFactory.getType(ResponseWriter.class)); + localsTypesMap.put(CLIENT_ID_VARIABLE, TypesFactory.getType(String.class)); //TODO: try load component class - localsTypesMap.put(COMPONENT_VARIABLE, UIComponent.class); - //TODO: try load renderer class - localsTypesMap.put(THIS_VARIABLE, Renderer.class); + localsTypesMap.put(COMPONENT_VARIABLE, TypesFactory.getType(UIComponent.class)); + + Type generatedClassSuperType = null; + + JavaClass superClass = this.generatedClass.getSuperClass(); + if (superClass != null) { + try { + //TODO use TypesFactory + Class<?> loadedSuperClass = Class.forName(superClass.getFullName(), false, classLoader); + generatedClassSuperType = TypesFactory.getType(loadedSuperClass); + } catch (ClassNotFoundException e) { + LOG.warn(e.getMessage(), e); + } catch (LinkageError e) { + LOG.warn(e.getMessage(), e); + } + } + + if (generatedClassSuperType == null) { + //fallback to Renderer.class + generatedClassSuperType = TypesFactory.getType(Renderer.class); + } + + localsTypesMap.put(THIS_VARIABLE, generatedClassSuperType); + + //TODO - different classes for 'this' and 'super' + localsTypesMap.put(SUPER_VARIABLE, generatedClassSuperType); } private void flushToEncodeMethod(String encodeMethodName) { @@ -304,7 +304,18 @@ javaMethod.setMethodBody(methodBody); methodBody.addStatement(0, new EncodeMethodPrefaceStatement()); - rendererClass.addMethod(javaMethod); + generatedClass.addMethod(javaMethod); + + Collection<Type> variableTypes = localsTypesMap.values(); + for (Type variableType : variableTypes) { + + Collection<Class<?>> importsList = variableType.getImportsList(); + if (importsList != null) { + for (Class<?> importedClass : importsList) { + generatedClass.addImport(importedClass); + } + } + } } createMethodContext(); @@ -325,41 +336,9 @@ return new JavaClass(simpleName, new JavaPackage(packageName)); } - //TODO handle arrays and generics - private Class<?> getClasByObjectTypeName(String type) { - Class<?> result = null; - - int dotIndex = type.indexOf('.'); - if (dotIndex < 0) { - //guess type - for (String guessPackage : GUESS_PACKAGES) { - try { - result = classLoader.loadClass(guessPackage + "." + type); - break; - } catch (ClassNotFoundException e) { - //ignore - } - } - } - - if (result == null) { - try { - classLoader.loadClass(type); - } catch (ClassNotFoundException e) { - //ignore - } - } - - if (result == null) { - result = Object.class; - } - - return result; - } - - private void defineObject(String type, String name, String initializationExpression) { + private void defineObject(Type type, String name, String initializationExpression) { currentStatement.addStatement(new DefineObjectStatement(type, name, initializationExpression)); - localsTypesMap.put(name, getClasByObjectTypeName(type)); + localsTypesMap.put(name, type); } protected void pushStatement(MethodBodyStatementsContainer container) { @@ -377,8 +356,8 @@ * * @return the rendererClass */ - public JavaClass getRendererClass() { - return this.rendererClass; + public JavaClass getGeneratedClass() { + return this.generatedClass; } /* (non-Javadoc) @@ -471,7 +450,7 @@ public void visitElement(String text) throws CdkException { if (text != null) { String trimmedText = text.trim(); - if (trimmedText.length() != 0) { + if (!Strings.isEmpty(trimmedText)) { currentStatement.addStatement(new WriteTextStatement(compileEl(trimmedText, String.class))); } } @@ -573,20 +552,32 @@ String name = cdkObjectElement.getName(); String value = cdkObjectElement.getValue(); - if (value == null || value.length() == 0) { + if (Strings.isEmpty(value)) { value = cdkObjectElement.getBodyValue(); } - String type = cdkObjectElement.getType(); - - if (value != null && value.length() != 0) { - if (type == null || type.length() == 0) { - type = getElExpressionType(value); + String typeString = cdkObjectElement.getType(); + String typeArgumentsString = cdkObjectElement.getTypeArguments(); + if (!Strings.isEmpty(typeArgumentsString)) { + typeString += "<" + typeArgumentsString + ">"; + } + + Type type = null; + if (!Strings.isEmpty(typeString)) { + type = TypesFactory.getType(typeString, classLoader); + } + + if (!Strings.isEmpty(value)) { + value = compileEl(value, Object.class); + if (type == null) { + type = lastCompiledExpressionType; } + } - value = compileEl(value, Object.class); + if (type == null) { + type = TypesFactory.getType(Object.class); } - + defineObject(type, name, value); } @@ -598,8 +589,15 @@ public void startElement(CdkForEachElement cdkForEachElement) { String items = cdkForEachElement.getItems(); String itemsExpression = compileEl(items, Iterable.class); - pushStatement(new ForEachStatement(itemsExpression, cdkForEachElement.getVar(), - getElExpressionContainerType(items))); + + //TODO - review + Class<?> collectionElementClass = lastCompiledExpressionType.getContainerType().getRawType(); + if (collectionElementClass == null) { + collectionElementClass = Object.class; + } + + pushStatement(new ForEachStatement(itemsExpression, cdkForEachElement.getVar(), + collectionElementClass.getName())); } /* (non-Javadoc) @@ -625,4 +623,8 @@ flushToEncodeMethod("encodeEnd"); } + public static void clearCaches() { + TypesFactory.clearCaches(); + ELParserUtils.clearCaches(); + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,12 +23,13 @@ package org.richfaces.cdk.templatecompiler; +import java.io.File; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.ModelBuilder; import org.richfaces.cdk.StandardSources; import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.RenderKit; import org.richfaces.cdk.model.Renderer; @@ -36,8 +37,6 @@ import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXBBinding; -import java.io.File; - /** * <p class="changed_added_4_0"></p> * @@ -56,15 +55,15 @@ ComponentLibrary library = context.getLibrary(); for (File file : getContext().getSources(StandardSources.RENDERER_TEMPLATES)) { - Template template = parseTemplate(file); - CompositeInterface compositeInterface = template.getInterface(); - // TODO - infer values ? - RenderKit renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); - Renderer renderer = new Renderer(new Renderer.Type(compositeInterface.getRendererType())); - renderKit.getRenderers().add(renderer); - String componentType = compositeInterface.getComponentType(); + Template template = parseTemplate(file); + CompositeInterface compositeInterface = template.getInterface(); + // TODO - infer values ? + RenderKit renderKit = library.addRenderKit(compositeInterface.getRenderKitId()); + Renderer renderer = new Renderer(new Renderer.Type(compositeInterface.getRendererType())); + renderKit.getRenderers().add(renderer); + String componentType = compositeInterface.getComponentType(); -// component.getRenderers().add(renderer); + // component.getRenderers().add(renderer); String family = compositeInterface.getComponentFamily(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CdkObjectElement.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -21,12 +21,12 @@ */ package org.richfaces.cdk.templatecompiler.model; -import org.richfaces.cdk.CdkException; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; +import org.richfaces.cdk.CdkException; + /** * @author Nick Belaevski * @since 4.0 @@ -46,6 +46,9 @@ @XmlAttribute(required = true) private String type; + @XmlAttribute(name = "type-arguments") + private String typeArguments; + /** * @return the bodyValue */ @@ -102,6 +105,20 @@ this.type = type; } + /** + * @return the typeArguments + */ + public String getTypeArguments() { + return typeArguments; + } + + /** + * @param typeArguments the typeArguments to set + */ + public void setTypeArguments(String typeArguments) { + this.typeArguments = typeArguments; + } + @Override public void visit(TemplateVisitor visitor) throws CdkException { visitor.visitElement(this); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigGenerator.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,6 +25,8 @@ package org.richfaces.cdk.xmlconfig; +import java.io.File; + import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWriter; @@ -32,8 +34,6 @@ import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; -import java.io.File; - /** * <p class="changed_added_4_0"> * </p> @@ -42,9 +42,11 @@ * */ public class FacesConfigGenerator implements CdkWriter { + + public static final String FACES_SCHEMA_LOCATION = ComponentLibrary.FACES_CONFIG_NAMESPACE + " " + + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; + private static final String FACES_CONFIG_XML = "META-INF/faces-config.xml"; - public static final String FACES_SCHEMA_LOCATION = ComponentLibrary.FACES_CONFIG_NAMESPACE + " " - + ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION; private CdkContext context; private JAXBBinding jaxbBinding; private FacesConfigAdapter libraryAdapter; @@ -89,7 +91,7 @@ ComponentLibrary library = context.getLibrary(); // TODO - check modification time. File facesConfigXml = context.createOutputFile(StandardOutputs.FACES_CONFIG, FACES_CONFIG_XML, - library.lastModified()); + library.lastModified()); if (null != facesConfigXml) { try { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -41,10 +41,11 @@ * */ public class FacesConfigParser implements ModelBuilder { + + private static final FacesConfigAdapter ADAPTER = new FacesConfigAdapter(); + private CdkContext context; private JAXBBinding jaxbBinding; - - private FacesConfigAdapter ADAPTER = new FacesConfigAdapter(); /** * <p class="changed_added_4_0"></p> @@ -66,14 +67,14 @@ FacesConfigBean unmarshal = unmarshalFacesConfig(file); if(null != unmarshal){ ComponentLibrary facesConfig = ADAPTER.unmarshal(unmarshal); - library.getComponents().addAll(facesConfig.getComponents()); - library.getRenderKits().putAll(facesConfig.getRenderKits()); - // TODO - merge changes into library. -// library.getRenderers().addAll(unmarshal.getRenderers()); -// library.getValidators().addAll(unmarshal.getValidators); -// library.getConverters().addAll(unmarshal.getConverters()); -// library.getBehaviors().addAll(unmarshal.getBehaviors()); -// library.setExtensions(unmarshal.getExtensions()); + library.getComponents().addAll(facesConfig.getComponents()); + library.getRenderKits().putAll(facesConfig.getRenderKits()); + // TODO - merge changes into library. + // library.getRenderers().addAll(unmarshal.getRenderers()); + // library.getValidators().addAll(unmarshal.getValidators); + // library.getConverters().addAll(unmarshal.getConverters()); + // library.getBehaviors().addAll(unmarshal.getBehaviors()); + // library.setExtensions(unmarshal.getExtensions()); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -25,7 +25,6 @@ package org.richfaces.cdk.xmlconfig; -import java.util.Collection; import java.util.Collections; import java.util.Map; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -27,7 +27,6 @@ import java.beans.Introspector; import java.beans.PropertyDescriptor; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -35,13 +34,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; - -import java.lang.reflect.Constructor; import java.lang.reflect.Method; - import java.net.URI; import java.net.URISyntaxException; - import java.util.Collection; import javax.xml.bind.JAXBContext; @@ -56,15 +51,11 @@ import javax.xml.transform.stream.StreamResult; import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer; - import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.model.Key; -import org.richfaces.cdk.model.ModelElement; - import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,28 +23,25 @@ package org.richfaces.cdk.xmlconfig.model; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; +import javax.xml.bind.annotation.adapters.XmlAdapter; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.model.ModelElement; -import org.richfaces.cdk.model.Property; import org.richfaces.cdk.xmlconfig.JAXBBinding; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * * @author asmirnov(a)exadel.com */ public abstract class AdapterBase<K,V> extends XmlAdapter<K, V> { - + @Override public K marshal(V model) throws CdkException { K bean = JAXBBinding.createAdapter(getBeanClass(model), model); @@ -73,27 +70,27 @@ protected <K, B extends MapEntry<K>, M extends ModelElement<? super M>> List<B> marshalMap(Map<K,M> map, AdapterBase<B, M> adapter) throws CdkException { - List<B> result = Lists.newArrayList(); - if(null != map && map.size()>0){ - for (Map.Entry<K, M> entry : map.entrySet()) { - B bean = adapter.marshal(entry.getValue()); - bean.setKey(entry.getKey()); - result.add(bean); - } + List<B> result = Lists.newArrayList(); + if(null != map && map.size()>0){ + for (Map.Entry<K, M> entry : map.entrySet()) { + B bean = adapter.marshal(entry.getValue()); + bean.setKey(entry.getKey()); + result.add(bean); } - return result; } + return result; + } protected <K,B extends MapEntry<K>, M extends ModelElement<? super M>> Map<K,M> unmarshalMap(List<B> list, AdapterBase<B, M> adapter) throws CdkException { - Map<K,M> map = Maps.newHashMap(); - if(null != list && list.size()>0){ - for (B bean : list) { - M model = adapter.unmarshal(bean); - map.put(bean.getKey(), model); - } + Map<K,M> map = Maps.newHashMap(); + if(null != list && list.size()>0){ + for (B bean : list) { + M model = adapter.unmarshal(bean); + map.put(bean.getKey(), model); } - return map; } + return map; + } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.BehaviorRenderer; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorRendererBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,14 +23,14 @@ package org.richfaces.cdk.xmlconfig.model; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,10 +23,10 @@ package org.richfaces.cdk.xmlconfig.model; +import javax.xml.bind.annotation.adapters.XmlAdapter; + import org.richfaces.cdk.model.ClassDescription; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,11 +23,11 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ComponentLibrary; - import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -35,9 +35,9 @@ */ public class ComponentAdapter extends AdapterBase<ComponentBean, Component> { - private final AttributeAdapter ATTRIBUTE_ADAPTER = new AttributeAdapter(); + private static final AttributeAdapter ATTRIBUTE_ADAPTER = new AttributeAdapter(); - private final FacetAdapter FACET_ADAPTER = new FacetAdapter(); + private static final FacetAdapter FACET_ADAPTER = new FacetAdapter(); @Override protected Class<? extends ComponentBean> getBeanClass(Component c) { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,20 +23,20 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.ConfigExtension; -import org.richfaces.cdk.model.Event; -import org.richfaces.cdk.model.Facet; -import org.richfaces.cdk.model.Property; +import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; +import org.richfaces.cdk.model.Event; + +import com.google.common.collect.Lists; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/DescriptionGroupBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -1,10 +1,10 @@ package org.richfaces.cdk.xmlconfig.model; +import javax.xml.bind.annotation.XmlElement; + import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.DescriptionGroup; -import javax.xml.bind.annotation.XmlElement; - public class DescriptionGroupBean implements DescriptionGroup { private String description; private String displayname; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.Event; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,13 +23,13 @@ package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; - import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; + /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,19 +23,20 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.List; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.Component; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.Event; import org.richfaces.cdk.model.Extensible; -import org.richfaces.cdk.model.RenderKit; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import com.google.common.collect.Lists; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.Facet; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,11 +23,11 @@ package org.richfaces.cdk.xmlconfig.model; +import javax.xml.bind.annotation.XmlElement; + import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; -import javax.xml.bind.annotation.XmlElement; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/Fragment.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,19 +23,10 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Maps; +import javax.xml.bind.annotation.XmlRootElement; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Property; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import java.util.List; -import java.util.Map; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,18 +23,20 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.EventName; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; -import java.util.Set; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; /** * <p class="changed_added_4_0"></p> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.RenderKit; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,7 +23,12 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.List; + +import javax.faces.render.RenderKitFactory; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.BehaviorRenderer; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; @@ -32,10 +37,7 @@ import org.richfaces.cdk.model.Renderer; import org.richfaces.cdk.model.RenderKit.Id; -import javax.faces.render.RenderKitFactory; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import com.google.common.collect.Lists; /** * <p class="changed_added_4_0"></p> @@ -101,7 +103,13 @@ @Override public void setKey(Id key) { this.key = key; - this.id = key.toString(); + + //TODO: Alex, please review fixed NPE + if (key != null) { + this.id = key.toString(); + } else { + this.id = null; + } } /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -24,10 +24,7 @@ package org.richfaces.cdk.xmlconfig.model; import org.richfaces.cdk.model.Renderer; -import org.richfaces.cdk.xmlconfig.JAXBBinding; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * <p class="changed_added_4_0"></p> * Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -23,17 +23,19 @@ package org.richfaces.cdk.xmlconfig.model; -import com.google.common.collect.Lists; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import org.richfaces.cdk.model.Attribute; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.Tag; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; +import com.google.common.collect.Lists; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-16 15:48:23 UTC (rev 16152) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2009-12-16 15:50:42 UTC (rev 16153) @@ -16,13 +16,11 @@ }) package org.richfaces.cdk.xmlconfig.model; -import org.richfaces.cdk.model.Attribute; -import org.richfaces.cdk.model.ClassDescription; -import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.Property; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import org.richfaces.cdk.model.ClassDescription; +import org.richfaces.cdk.model.ComponentLibrary; +

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r16152 - in root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el: types and 1 other directory.

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

Author: nbelaevski Date: 2009-12-16 10:48:23 -0500 (Wed, 16 Dec 2009) New Revision: 16152 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java Log: https://jira.jboss.org/jira/browse/RF-7732 Fixed NPE in CDK Fixed CheckStyle errors in CDK Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ComplexType.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,233 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; + +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.util.ArrayUtils; + +/** + * @author Nick Belaevski + * + */ +public class ComplexType implements Type { + + private Type clearComponentType; + + private Type[] typeArguments; + + private Class<?> cachedRawType; + + private int arrayDepth; + + public ComplexType(Type clearComponentType, Type[] typeArguments, int arrayDepth) { + super(); + this.clearComponentType = clearComponentType; + this.typeArguments = typeArguments; + this.arrayDepth = arrayDepth; + } + + /* + * (non-Javadoc) + * + * @see org.richfaces.cdk.parser.el.Type#getImportsList() + */ + @Override + public Collection<Class<?>> getImportsList() { + Set<Class<?>> result = new LinkedHashSet<Class<?>>(); + + result.addAll(clearComponentType.getImportsList()); + for (Type typeArgument : typeArguments) { + result.addAll(typeArgument.getImportsList()); + } + + return result; + } + + /* + * (non-Javadoc) + * + * @see org.richfaces.cdk.parser.el.Type#isNullType() + */ + @Override + public boolean isNullType() { + return false; + } + + /* + * (non-Javadoc) + * + * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + */ + @Override + public Type[] getTypeArguments() { + return typeArguments; + } + + @Override + public Type getContainerType() { + if (arrayDepth != 0) { + return new ComplexType(clearComponentType, typeArguments, arrayDepth - 1); + } else { + if (!ArrayUtils.isEmpty(typeArguments)) { + return typeArguments[typeArguments.length - 1]; + } else { + return TypesFactory.getType(Object.class); + } + } + } + + /* + * (non-Javadoc) + * + * @see org.richfaces.cdk.parser.el.Type#getCode() + */ + @Override + public String getCode() { + StringBuilder sb = new StringBuilder(); + sb.append(clearComponentType.getCode()); + + if (!ArrayUtils.isEmpty(typeArguments)) { + sb.append("<"); + for (int i = 0; i < typeArguments.length; i++) { + Type typeArgument = typeArguments[i]; + + if (i != 0) { + sb.append(", "); + } + + sb.append(typeArgument.getCode()); + } + + sb.append(">"); + } + + for (int i = 0; i < arrayDepth; i++) { + sb.append("[]"); + } + + return sb.toString(); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + arrayDepth; + result = prime * result + ((clearComponentType == null) ? 0 : clearComponentType.hashCode()); + result = prime * result + Arrays.hashCode(typeArguments); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + ComplexType other = (ComplexType) obj; + if (arrayDepth != other.arrayDepth) { + return false; + } + if (clearComponentType == null) { + if (other.clearComponentType != null) { + return false; + } + } else if (!clearComponentType.equals(other.clearComponentType)) { + return false; + } + if (!Arrays.equals(typeArguments, other.typeArguments)) { + return false; + } + return true; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getRawType() + */ + @Override + public Class<?> getRawType() { + if (cachedRawType == null) { + Class<?> rawType = clearComponentType.getRawType(); + if (rawType != null) { + if (arrayDepth != 0) { + int[] dimensions = new int[arrayDepth]; + //TODO: more efficient way to create array class + cachedRawType = Array.newInstance(rawType, dimensions).getClass(); + } else { + cachedRawType = rawType; + } + } + } + + return cachedRawType; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isArray() + */ + @Override + public boolean isArray() { + return arrayDepth != 0; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + */ + @Override + public boolean isAssignableFrom(Type anotherType) { + Class<?> thisWrapperClass = TypesFactory.getWrapperClass(getRawType()); + Class<?> anotherWrapperClass = TypesFactory.getWrapperClass(anotherType.getRawType()); + + if (thisWrapperClass.isAssignableFrom(anotherWrapperClass)) { + Type[] thisTypeArguments = getTypeArguments(); + if (ArrayUtils.isEmpty(thisTypeArguments)) { + return true; + } + + Type[] anotherTypeArguments = anotherType.getTypeArguments(); + if (ArrayUtils.isEmpty(anotherTypeArguments)) { + return true; + } + + return Arrays.equals(thisTypeArguments, anotherTypeArguments); + } else { + return false; + } + } +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/NullType.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.util.Collection; +import java.util.Collections; + +import org.richfaces.cdk.parser.el.Type; + +/** + * @author Nick Belaevski + * + */ +public final class NullType implements Type { + + public static final Type INSTANCE = new NullType(); + + /** + * + */ + private NullType() { + //this class is a singleton, thus has private ctor + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCode() + */ + @Override + public String getCode() { + throw new UnsupportedOperationException(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getImportsIterator() + */ + @Override + public Collection<Class<?>> getImportsList() { + return Collections.emptyList(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isNullType() + */ + @Override + public boolean isNullType() { + return true; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getRawType() + */ + @Override + public Class<?> getRawType() { + //TODO review + return Object.class; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + */ + @Override + public Type[] getTypeArguments() { + return null; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return getClass().getName(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getContainerType() + */ + @Override + public Type getContainerType() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isArray() + */ + @Override + public boolean isArray() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + */ + @Override + public boolean isAssignableFrom(Type anotherType) { + return true; + } +} \ No newline at end of file Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/PlainClassType.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,162 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.Collection; + +import org.richfaces.cdk.parser.el.Type; + +/** + * @author Nick Belaevski + * + */ +public class PlainClassType implements Type { + + private Class<?> clazz; + + public PlainClassType(Class<?> clazz) { + super(); + + if (clazz.isArray()) { + throw new IllegalArgumentException("Array classes are not supported"); + } + + this.clazz = clazz; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCode() + */ + @Override + public String getCode() { + return clazz.getSimpleName(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getImportsIterator() + */ + @Override + public Collection<Class<?>> getImportsList() { + return Arrays.<Class<?>>asList(clazz); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isNullType() + */ + @Override + public boolean isNullType() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getRawType() + */ + @Override + public Class<?> getRawType() { + return clazz; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + */ + @Override + public Type[] getTypeArguments() { + return null; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((clazz == null) ? 0 : clazz.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + PlainClassType other = (PlainClassType) obj; + if (clazz == null) { + if (other.clazz != null) { + return false; + } + } else if (!clazz.equals(other.clazz)) { + return false; + } + return true; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return MessageFormat.format("{0}: {1}", getClass().getName(), clazz.toString()); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCompositeType() + */ + @Override + public Type getContainerType() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isArray() + */ + @Override + public boolean isArray() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + */ + @Override + public boolean isAssignableFrom(Type anotherType) { + if (anotherType.isNullType()) { + return !clazz.isPrimitive(); + } else { + Class<?> thisWrapperClass = TypesFactory.getWrapperClass(clazz); + Class<?> anotherWrapperClass = TypesFactory.getWrapperClass(anotherType.getRawType()); + + return thisWrapperClass.isAssignableFrom(anotherWrapperClass); + } + } +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/ReferencedType.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,171 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.text.MessageFormat; +import java.util.Collection; +import java.util.Collections; + +import org.richfaces.cdk.parser.el.Type; + +/** + * @author Nick Belaevski + * + */ +public class ReferencedType implements Type { + + private String referencedClassName; + + private Class<?> knownType; + + public ReferencedType(String className) { + this(className, Object.class); + } + + public ReferencedType(String className, Class<?> knownType) { + super(); + + this.referencedClassName = className; + this.knownType = knownType; + } + + /** + * @return the referencedClassName + */ + String getReferencedClassName() { + return referencedClassName; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCode() + */ + @Override + public String getCode() { + return referencedClassName; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getImportsList() + */ + @Override + public Collection<Class<?>> getImportsList() { + return Collections.emptyList(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getRawType() + */ + @Override + public Class<?> getRawType() { + return knownType; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isNullType() + */ + @Override + public boolean isNullType() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + */ + @Override + public Type[] getTypeArguments() { + return null; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((referencedClassName == null) ? 0 : referencedClassName.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + ReferencedType other = (ReferencedType) obj; + if (referencedClassName == null) { + if (other.referencedClassName != null) { + return false; + } + } else if (!referencedClassName.equals(other.referencedClassName)) { + return false; + } + return true; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return MessageFormat.format("{0}: {1}", getClass().getName(), getCode()); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCompositeType() + */ + @Override + public Type getContainerType() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isArray() + */ + @Override + public boolean isArray() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + */ + @Override + public boolean isAssignableFrom(Type anotherType) { + if (anotherType instanceof ReferencedType) { + ReferencedType anotherReferencedType = (ReferencedType) anotherType; + + return getReferencedClassName().equals(anotherReferencedType.getReferencedClassName()); + } + + return false; + } +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,293 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.Behavior; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + +import org.richfaces.cdk.parser.el.Type; +import org.richfaces.cdk.util.ArrayUtils; + +/** + * @author Nick Belaevski + * + */ +public final class TypesFactory { + + private static final Map<java.lang.reflect.Type, Type> REFLECTION_TYPES_CACHE = + Collections.synchronizedMap(new HashMap<java.lang.reflect.Type, Type>()); + + private static final Map<String, Type> REFERENCED_TYPES_CACHE = + Collections.synchronizedMap(new HashMap<String, Type>()); + + private static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPER_CLASSES_MAP; + private static final Map<String, Class<?>> PRIMITIVE_CLASSES_MAP; + + static { + Map<Class<?>, Class<?>> primitiveToWrapperClassesMap = new HashMap<Class<?>, Class<?>>(); + primitiveToWrapperClassesMap.put(Boolean.TYPE, Boolean.class); + primitiveToWrapperClassesMap.put(Float.TYPE, Float.class); + primitiveToWrapperClassesMap.put(Long.TYPE, Long.class); + primitiveToWrapperClassesMap.put(Integer.TYPE, Integer.class); + primitiveToWrapperClassesMap.put(Short.TYPE, Short.class); + primitiveToWrapperClassesMap.put(Byte.TYPE, Byte.class); + primitiveToWrapperClassesMap.put(Double.TYPE, Double.class); + primitiveToWrapperClassesMap.put(Character.TYPE, Character.class); + + PRIMITIVE_TO_WRAPPER_CLASSES_MAP = Collections.unmodifiableMap(primitiveToWrapperClassesMap); + + Map<String, Class<?>> primitiveClassesMap = new HashMap<String, Class<?>>(); + for (Class<?> primitiveClass : PRIMITIVE_TO_WRAPPER_CLASSES_MAP.keySet()) { + primitiveClassesMap.put(primitiveClass.getName(), primitiveClass); + } + + PRIMITIVE_CLASSES_MAP = Collections.unmodifiableMap(primitiveClassesMap); + } + + private static final Pattern CLASS_SIGNATURE_PATTERN = Pattern.compile("^" + + "\\s*([^\\[<]+)\\s*" + //class name + "(?:<\\s*(.*)\\s*>)?\\s*" + //generic signature + "((?:\\[\\s*\\]\\s*)+)?\\s*" + //array signature + "$"); + + private static final int CLASS_NAME_GROUP_IDX = 1; + + private static final int TYPE_ARGUMENTS_GROUP_IDX = 2; + + private static final int ARRAY_SIGNATURE_GROUP_IDX = 3; + + private static final int ARRAY_SIGNATURE_LENGTH = "[]".length(); + + private static final String[] GUESS_PACKAGES; + + static { + Class<?>[] guessPackagesClasses = { + UIComponent.class, + Behavior.class, + Converter.class, + FacesContext.class, + Collection.class, + Object.class + }; + + GUESS_PACKAGES = new String[guessPackagesClasses.length]; + int i = 0; + for (Class<?> guessPackageClass : guessPackagesClasses) { + GUESS_PACKAGES[i++] = guessPackageClass.getPackage().getName(); + } + } + + private TypesFactory() { + } + + private static Type getPlainClassType(Class<?> plainClass) { + Type plainClassType = REFLECTION_TYPES_CACHE.get(plainClass); + if (plainClassType == null) { + plainClassType = new PlainClassType(plainClass); + REFLECTION_TYPES_CACHE.put(plainClass, plainClassType); + } + + return plainClassType; + } + + private static Type getReferencedType(String referencedClassName) { + Type type = REFERENCED_TYPES_CACHE.get(referencedClassName); + if (type == null) { + type = new ReferencedType(referencedClassName); + REFERENCED_TYPES_CACHE.put(referencedClassName, type); + } + + return type; + } + + private static Class<?> tryLoadClas(String type, ClassLoader classLoader) throws ClassNotFoundException { + int dotIndex = type.indexOf('.'); + if (dotIndex < 0) { + //guess type + for (String guessPackage : GUESS_PACKAGES) { + try { + return Class.forName(guessPackage + "." + type, false, classLoader); + } catch (ClassNotFoundException e) { + //ignore + } catch (LinkageError e) { + // TODO: handle exception + } + } + } + + Class<?> result = PRIMITIVE_CLASSES_MAP.get(type); + if (result == null) { + result = Class.forName(type, true, classLoader); + } + + return result; + } + + static Type[] parseTypeArgumentsString(String typeArguments, ClassLoader classLoader) { + if (typeArguments == null) { + return null; + } + + String[] typeArgumentsSplit = typeArguments.trim().split(","); + + Type[] types = new Type[typeArgumentsSplit.length]; + for (int i = 0; i < typeArgumentsSplit.length; i++) { + types[i] = getType(typeArgumentsSplit[i], classLoader); + } + + return types; + } + + public static Type getType(String typeString, ClassLoader classLoader) { + Matcher matcher = CLASS_SIGNATURE_PATTERN.matcher(typeString); + boolean matchResult = matcher.matches(); + if (!matchResult) { + //TODO review + throw new IllegalArgumentException("Cannot parse type signature: " + typeString); + } + + String className = matcher.group(CLASS_NAME_GROUP_IDX).trim(); + + String typeArgumentsString = matcher.group(TYPE_ARGUMENTS_GROUP_IDX); + Type[] typeArguments = parseTypeArgumentsString(typeArgumentsString, classLoader); + + String arraySignature = matcher.group(ARRAY_SIGNATURE_GROUP_IDX); + int arrayDepth = 0; + if (arraySignature != null) { + arrayDepth = arraySignature.replaceAll("\\s+", "").length() / ARRAY_SIGNATURE_LENGTH; + } + + Type baseType; + try { + //NB: loadedClass can have name that differs from className! + Class<?> loadedClas = tryLoadClas(className, classLoader); + + baseType = getType(loadedClas); + } catch (ClassNotFoundException e) { + baseType = getReferencedType(className); + } + + if (arrayDepth != 0 || !ArrayUtils.isEmpty(typeArguments)) { + return new ComplexType(baseType, typeArguments, arrayDepth); + } else { + return baseType; + } + } + + static Type createType(java.lang.reflect.Type reflectionType) { + java.lang.reflect.Type[] actualTypeArguments = null; + Class<?> rawType = null; + int arrayDepth = 0; + + java.lang.reflect.Type localReflectionType = reflectionType; + + while (localReflectionType instanceof GenericArrayType) { + localReflectionType = ((GenericArrayType) localReflectionType).getGenericComponentType(); + arrayDepth++; + } + + if (localReflectionType instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) localReflectionType; + + actualTypeArguments = parameterizedType.getActualTypeArguments(); + rawType = (Class<?>) parameterizedType.getRawType(); + } else if (localReflectionType instanceof Class<?>) { + rawType = (Class<?>) localReflectionType; + } + + if (rawType != null) { + while (rawType.isArray()) { + arrayDepth++; + rawType = rawType.getComponentType(); + } + + Type[] typeArguments = null; + if (!ArrayUtils.isEmpty(actualTypeArguments)) { + typeArguments = getTypesArray(actualTypeArguments); + } + + Type clearComponentType = getPlainClassType(rawType); + if (!ArrayUtils.isEmpty(typeArguments) || arrayDepth != 0) { + return new ComplexType(clearComponentType, typeArguments, arrayDepth); + } else { + return clearComponentType; + } + } else { + return new UnsupportedType(reflectionType); + } + } + + public static Type getType(java.lang.reflect.Type reflectionType) { + Type result = REFLECTION_TYPES_CACHE.get(reflectionType); + if (result == null) { + result = createType(reflectionType); + REFLECTION_TYPES_CACHE.put(reflectionType, result); + } + + return result; + } + + public static Type[] getTypesArray(java.lang.reflect.Type[] reflectionTypes) { + Type[] types = new Type[reflectionTypes.length]; + for (int i = 0; i < reflectionTypes.length; i++) { + types[i] = getType(reflectionTypes[i]); + } + + return types; + } + + public static Type getNullType() { + return NullType.INSTANCE; + } + + public static void clearCaches() { + REFLECTION_TYPES_CACHE.clear(); + REFERENCED_TYPES_CACHE.clear(); + } + + /** + * Returns wrapper classes for passed-in class. If type is primitive, then corresponding + * wrapper class is returned (e.g. boolean -> Boolean), otherwise does nothing and returns + * passed-in class. + * + * @return wrapper for primitive types, or passed-in class + */ + static Class<?> getWrapperClass(Class<?> inClazz) { + if (inClazz.isPrimitive()) { + return PRIMITIVE_TO_WRAPPER_CLASSES_MAP.get(inClazz); + } else { + return inClazz; + } + } + +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/UnsupportedType.java 2009-12-16 15:48:23 UTC (rev 16152) @@ -0,0 +1,145 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.types; + +import java.util.Collection; +import java.util.Collections; + +import org.richfaces.cdk.parser.el.Type; + +/** + * @author Nick Belaevski + * + */ +//TODO replace with referenced type? +public class UnsupportedType implements Type { + + private java.lang.reflect.Type reflectionType; + + /** + * @param reflectionType + */ + public UnsupportedType(java.lang.reflect.Type reflectionType) { + this.reflectionType = reflectionType; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getCode() + */ + @Override + public String getCode() { + return reflectionType.toString(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getContainerType() + */ + @Override + public Type getContainerType() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getImportsList() + */ + @Override + public Collection<Class<?>> getImportsList() { + return Collections.emptyList(); + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getRawType() + */ + @Override + public Class<?> getRawType() { + return Object.class; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#getTypeArguments() + */ + @Override + public Type[] getTypeArguments() { + return null; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isArray() + */ + @Override + public boolean isArray() { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isAssignableFrom(org.richfaces.cdk.parser.el.Type) + */ + @Override + public boolean isAssignableFrom(Type anotherType) { + return false; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.Type#isNullType() + */ + @Override + public boolean isNullType() { + return false; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((reflectionType == null) ? 0 : reflectionType.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + UnsupportedType other = (UnsupportedType) obj; + if (reflectionType == null) { + if (other.reflectionType != null) { + return false; + } + } else if (!reflectionType.equals(other.reflectionType)) { + return false; + } + return true; + } + +}

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2009