JBoss Rich Faces SVN: r15395 - in root/examples/tags: 4.0.0.ALPHA1 and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:44:38 -0400 (Fri, 28 Aug 2009)
New Revision: 15395
Added:
root/examples/tags/4.0.0.ALPHA1/
Modified:
root/examples/tags/4.0.0.ALPHA1/components/calendar-demo/pom.xml
root/examples/tags/4.0.0.ALPHA1/components/core-demo/pom.xml
root/examples/tags/4.0.0.ALPHA1/components/panel-demo/pom.xml
root/examples/tags/4.0.0.ALPHA1/components/pom.xml
root/examples/tags/4.0.0.ALPHA1/components/repeater-demo/pom.xml
root/examples/tags/4.0.0.ALPHA1/components/tree-demo/pom.xml
root/examples/tags/4.0.0.ALPHA1/photoalbum/pom.xml
root/examples/tags/4.0.0.ALPHA1/pom.xml
root/examples/tags/4.0.0.ALPHA1/richfaces-demo/pom.xml
Log:
Tagging ALPHA1 release
Copied: root/examples/tags/4.0.0.ALPHA1 (from rev 15387, root/examples/trunk)
Modified: root/examples/tags/4.0.0.ALPHA1/components/calendar-demo/pom.xml
===================================================================
--- root/examples/trunk/components/calendar-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/calendar-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/examples/tags/4.0.0.ALPHA1/components/core-demo/pom.xml
===================================================================
--- root/examples/trunk/components/core-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/core-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<properties>
Modified: root/examples/tags/4.0.0.ALPHA1/components/panel-demo/pom.xml
===================================================================
--- root/examples/trunk/components/panel-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/panel-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/examples/tags/4.0.0.ALPHA1/components/pom.xml
===================================================================
--- root/examples/trunk/components/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>examples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,12 +28,12 @@
<dependency>
<groupId>org.richfaces.ui.components</groupId>
<artifactId>${example.componentName}-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui.components</groupId>
<artifactId>${example.componentName}Model-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: root/examples/tags/4.0.0.ALPHA1/components/repeater-demo/pom.xml
===================================================================
--- root/examples/trunk/components/repeater-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/repeater-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -2,14 +2,14 @@
<parent>
<artifactId>examples</artifactId>
<groupId>org.richfaces</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.examples</groupId>
<artifactId>repeater</artifactId>
<packaging>war</packaging>
<name>repeater Maven Webapp</name>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<build>
<finalName>repeater</finalName>
<plugins>
Modified: root/examples/tags/4.0.0.ALPHA1/components/tree-demo/pom.xml
===================================================================
--- root/examples/trunk/components/tree-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/components/tree-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/examples/tags/4.0.0.ALPHA1/photoalbum/pom.xml
===================================================================
--- root/examples/trunk/photoalbum/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/photoalbum/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>examples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/examples/tags/4.0.0.ALPHA1/pom.xml
===================================================================
--- root/examples/trunk/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>examples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<packaging>pom</packaging>
<name>richfaces components examples</name>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
<!-- simple logger binding: only messages of level INFO and higher are printed-->
Modified: root/examples/tags/4.0.0.ALPHA1/richfaces-demo/pom.xml
===================================================================
--- root/examples/trunk/richfaces-demo/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/examples/tags/4.0.0.ALPHA1/richfaces-demo/pom.xml 2009-08-28 08:44:38 UTC (rev 15395)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>examples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.ui.components</groupId>
<artifactId>core-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
<dependency>
14 years, 8 months
JBoss Rich Faces SVN: r15394 - in root/docs/tags: 4.0.0.ALPHA1 and 11 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:43:12 -0400 (Fri, 28 Aug 2009)
New Revision: 15394
Added:
root/docs/tags/4.0.0.ALPHA1/
Modified:
root/docs/tags/4.0.0.ALPHA1/commons/highlight/pom.xml
root/docs/tags/4.0.0.ALPHA1/commons/pom.xml
root/docs/tags/4.0.0.ALPHA1/commons/resources/en/pom.xml
root/docs/tags/4.0.0.ALPHA1/commons/resources/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/en/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/en/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/testguide/en/pom.xml
root/docs/tags/4.0.0.ALPHA1/guides/testguide/pom.xml
root/docs/tags/4.0.0.ALPHA1/pom.xml
Log:
Tagging ALPHA1 release
Copied: root/docs/tags/4.0.0.ALPHA1 (from rev 15387, root/docs/trunk)
Modified: root/docs/tags/4.0.0.ALPHA1/commons/highlight/pom.xml
===================================================================
--- root/docs/trunk/commons/highlight/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/commons/highlight/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>commons</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/commons/pom.xml
===================================================================
--- root/docs/trunk/commons/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/commons/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>docs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/commons/resources/en/pom.xml
===================================================================
--- root/docs/trunk/commons/resources/en/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/commons/resources/en/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.docs.commons</groupId>
<artifactId>resources</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/commons/resources/pom.xml
===================================================================
--- root/docs/trunk/commons/resources/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/commons/resources/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>commons</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/en/pom.xml
===================================================================
--- root/docs/trunk/guides/migrationguide/en/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/en/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.richfaces.docs.guides</groupId>
<artifactId>migrationGuide</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/pom.xml
===================================================================
--- root/docs/trunk/guides/migrationguide/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/migrationguide/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>guides</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs.guides</groupId>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/en/pom.xml
===================================================================
--- root/docs/trunk/guides/photo_album_app_guide/en/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/en/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.richfaces.docs.guides</groupId>
<artifactId>photo_album_app_guide</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/pom.xml
===================================================================
--- root/docs/trunk/guides/photo_album_app_guide/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/photo_album_app_guide/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>guides</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.docs.guides</groupId>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/pom.xml
===================================================================
--- root/docs/trunk/guides/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>docs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/testguide/en/pom.xml
===================================================================
--- root/docs/trunk/guides/testguide/en/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/testguide/en/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.docs.guides</groupId>
<artifactId>testguide</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/guides/testguide/pom.xml
===================================================================
--- root/docs/trunk/guides/testguide/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/guides/testguide/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.docs</groupId>
<artifactId>guides</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/docs/tags/4.0.0.ALPHA1/pom.xml
===================================================================
--- root/docs/trunk/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/docs/tags/4.0.0.ALPHA1/pom.xml 2009-08-28 08:43:12 UTC (rev 15394)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>docs</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<packaging>pom</packaging>
<name>richfaces project documentation</name>
14 years, 8 months
JBoss Rich Faces SVN: r15393 - in root/cdk/tags/4.0.0.ALPHA1: archetypes and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:42:27 -0400 (Fri, 28 Aug 2009)
New Revision: 15393
Modified:
root/cdk/tags/4.0.0.ALPHA1/archetypes/pom.xml
root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-multimodule/pom.xml
root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-singlemodule/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/annotations/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/generator/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/generator/src/main/resources/META-INF/templates/component.ftl
root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/maven-javascript-plugin/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/maven-resource-dependency-plugin/pom.xml
root/cdk/tags/4.0.0.ALPHA1/plugins/pom.xml
root/cdk/tags/4.0.0.ALPHA1/pom.xml
Log:
Version changed to A1
Modified: root/cdk/tags/4.0.0.ALPHA1/archetypes/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/archetypes/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/archetypes/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>cdk</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-multimodule/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-multimodule/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-multimodule/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetypes</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-singlemodule/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-singlemodule/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/archetypes/ui-singlemodule/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetypes</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/annotations/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/annotations/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/annotations/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -5,11 +5,11 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.richfaces.cdk</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<description>That project contains annotations for JSF classes</description>
<name>annotations</name>
<build>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/generator/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/generator/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/generator/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -5,12 +5,12 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>generator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<name>Java Server Faces component generator</name>
<dependencyManagement>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
<!--
<dependency> <groupId>javax.xml.bind</groupId>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-08-28 08:42:27 UTC (rev 15393)
@@ -44,7 +44,7 @@
/**
* ${description!}
**/
-@Generated({"RicFaces CDK","4.0.0-SNAPSHOT"})
+@Generated({"RicFaces CDK","4.0.0.ALPHA1"})
public class ${componentClass.simpleName} extends ${baseClass} <#if (eventNames?size > 0)>implements ClientBehaviorHolder</#if> {
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -3,12 +3,12 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<packaging>maven-plugin</packaging>
<name>Maven plugin for JSF components code generation</name>
<dependencies>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>generator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
</dependencies>
<build>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -9,7 +9,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<configuration>
</configuration>
<executions>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/maven-javascript-plugin/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/maven-javascript-plugin/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/maven-javascript-plugin/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-javascript-plugin</artifactId>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/maven-resource-dependency-plugin/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/maven-resource-dependency-plugin/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/maven-resource-dependency-plugin/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,7 +11,7 @@
<artifactId>maven-resource-dependency-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<name>maven-resource-dependency-plugin</name>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</dependency>
</dependencies>
Modified: root/cdk/tags/4.0.0.ALPHA1/plugins/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/plugins/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/plugins/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>cdk</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/tags/4.0.0.ALPHA1/pom.xml
===================================================================
--- root/cdk/tags/4.0.0.ALPHA1/pom.xml 2009-08-28 08:39:50 UTC (rev 15392)
+++ root/cdk/tags/4.0.0.ALPHA1/pom.xml 2009-08-28 08:42:27 UTC (rev 15393)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>cdk</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.ALPHA1</version>
<packaging>pom</packaging>
<name>JSF components development kit</name>
14 years, 8 months
JBoss Rich Faces SVN: r15392 - root/cdk/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:39:50 -0400 (Fri, 28 Aug 2009)
New Revision: 15392
Added:
root/cdk/tags/4.0.0.ALPHA1/
Log:
Tagging ALPHA1 release
Copied: root/cdk/tags/4.0.0.ALPHA1 (from rev 15391, root/cdk/trunk)
14 years, 8 months
JBoss Rich Faces SVN: r15391 - in root: docs and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:35:05 -0400 (Fri, 28 Aug 2009)
New Revision: 15391
Added:
root/cdk/branches/
root/cdk/tags/
root/docs/branches/
root/docs/tags/
root/examples-sandbox/branches/
root/examples-sandbox/tags/
root/examples/branches/
root/examples/tags/
root/framework/branches/
root/framework/tags/
root/ui-sandbox/branches/
root/ui-sandbox/tags/
root/ui/branches/
root/ui/tags/
Log:
tags/branches directories added
14 years, 8 months
JBoss Rich Faces SVN: r15390 - root/framework/trunk/impl/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:23:46 -0400 (Fri, 28 Aug 2009)
New Revision: 15390
Modified:
root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java
Log:
VersionBean: date updated
Modified: root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-28 08:02:34 UTC (rev 15389)
+++ root/framework/trunk/impl/src/main/java/org/richfaces/VersionBean.java 2009-08-28 08:23:46 UTC (rev 15390)
@@ -36,8 +36,7 @@
/**
* Revision version, must be auto modified by CVS
- */
-
+ */
public static final String REVISION = "0-SNAPSHOT" ;
public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$";
public static final Version _version = new Version();
14 years, 8 months
JBoss Rich Faces SVN: r15389 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 04:02:34 -0400 (Fri, 28 Aug 2009)
New Revision: 15389
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java
Log:
Fixed failing unit tests on windows
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-08-28 07:54:09 UTC (rev 15388)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-08-28 08:02:34 UTC (rev 15389)
@@ -104,7 +104,7 @@
options.add("-classpath");
hasClassPathElement = true;
}
- classPathOption.append(cpElement.toExternalForm());
+ classPathOption.append(cpElement.getFile());
}
classPathLoader = classPathLoader.getParent();
}
14 years, 8 months
JBoss Rich Faces SVN: r15388 - root.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 03:54:09 -0400 (Fri, 28 Aug 2009)
New Revision: 15388
Modified:
root/pom.xml
Log:
CDK added to build
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
+++ root/pom.xml 2009-08-28 07:54:09 UTC (rev 15388)
@@ -32,7 +32,7 @@
<modules>
<module>framework/${framework.svn.dir}</module>
- <!--module>cdk/${cdk.svn.dir}</module-->
+ <module>cdk/${cdk.svn.dir}</module>
<module>ui/${ui.svn.dir}</module>
<!--<module>ui-sandbox/${ui-sandbox.svn.dir}</module>-->
<module>examples/${examples.svn.dir}</module>
14 years, 8 months
JBoss Rich Faces SVN: r15387 - in root: ui/trunk/components and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-08-28 03:52:47 -0400 (Fri, 28 Aug 2009)
New Revision: 15387
Added:
root/deployRelease.sh
Modified:
root/pom.xml
root/ui/trunk/components/pom.xml
Log:
Deployment information added
Added: root/deployRelease.sh
===================================================================
--- root/deployRelease.sh (rev 0)
+++ root/deployRelease.sh 2009-08-28 07:52:47 UTC (rev 15387)
@@ -0,0 +1,4 @@
+PROJECT_DIR=`pwd`
+SETTINGS_XML=`cygpath --windows ~/.m2t/settings.xml`
+
+mvn -s $SETTINGS_XML -P local,release,trunk clean deploy
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2009-08-28 07:18:17 UTC (rev 15386)
+++ root/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
@@ -11,7 +11,26 @@
<packaging>pom</packaging>
<name>richfaces all module aggregator</name>
- <modules>
+ <distributionManagement>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ <repository>
+ <id>repository.jboss.org</id>
+ <uniqueVersion>false</uniqueVersion>
+ <url>${releaseRepository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <uniqueVersion>true</uniqueVersion>
+ <url>${snapshotRepository}</url>
+ </snapshotRepository>
+ <!--site>
+ <url>file:target/site2</url>
+ </site-->
+ </distributionManagement>
+
+ <modules>
<module>framework/${framework.svn.dir}</module>
<!--module>cdk/${cdk.svn.dir}</module-->
<module>ui/${ui.svn.dir}</module>
@@ -50,6 +69,12 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-4</version>
<executions>
Modified: root/ui/trunk/components/pom.xml
===================================================================
--- root/ui/trunk/components/pom.xml 2009-08-28 07:18:17 UTC (rev 15386)
+++ root/ui/trunk/components/pom.xml 2009-08-28 07:52:47 UTC (rev 15387)
@@ -30,9 +30,9 @@
</dependencies-->
<modules>
<module>core</module>
- <module>panel</module>
+ <!--module>panel</module>
<module>tree</module>
- <module>calendar</module>
+ <module>calendar</module-->
</modules>
</project>
\ No newline at end of file
14 years, 8 months
JBoss Rich Faces SVN: r15386 - in root/cdk/trunk/plugins: generator/src/main/java/org/richfaces/cdk and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-08-28 03:18:17 -0400 (Fri, 28 Aug 2009)
New Revision: 15386
Added:
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.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/freemarker/ComponentTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
Log:
Integration test passed
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/templates/RendererClassGenerator.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -38,15 +38,19 @@
import org.richfaces.cdk.model.RenderKit;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
public class RendererClassGenerator implements CdkWriter {
private CdkContext context;
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.richfaces.cdk.CdkWriter#init(org.richfaces.cdk.CdkContext)
*/
@Override
@@ -56,8 +60,12 @@
}
- /* (non-Javadoc)
- * @see org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.richfaces.cdk.CdkWriter#render(org.richfaces.cdk.model.ComponentLibrary
+ * )
*/
@Override
public void render(ComponentLibrary library) throws CdkException {
@@ -65,22 +73,20 @@
for (Renderer renderer : renderKit.getRenderers()) {
JavaClass javaClass = renderer.getTemplate();
String fullName = javaClass.getFullName();
-
- File outFile = new File(context.getOutputFolder(StandardOutputs.RENDERER_CLASSES),
- fullName.replace('.', '/') + ".java");
-
- if (outFile.exists()) {
- outFile.delete();
- }
- outFile.getParentFile().mkdirs();
-
- try {
- new JavaClassRenderer().render(javaClass, new PrintWriter(outFile));
- } catch (FileNotFoundException e) {
- throw new CdkException(e);
+ File outFile = context.createOutputFile(
+ StandardOutputs.RENDERER_CLASSES, fullName.replace('.',
+ '/')
+ + ".java", library.lastModified());
+ if (null != outFile) {
+ try {
+ new JavaClassRenderer().render(javaClass,
+ new PrintWriter(outFile));
+ } catch (FileNotFoundException e) {
+ throw new CdkException(e);
+ }
+
}
-
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/StandardOutputs.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -39,7 +39,8 @@
FACES_CONFIG(StandardOutputFolders.RESOURCES),
TAG_LIBRARY(StandardOutputFolders.RESOURCES),
JBDS_RENDERERS(StandardOutputFolders.JAVA_CLASSES),
- XML_SCHEMA(StandardOutputFolders.RESOURCES);
+ XML_SCHEMA(StandardOutputFolders.RESOURCES),
+ COMPONENT_TEST(StandardOutputFolders.TEST_JAVA_CLASSES);
private final OutputType folderType;
/**
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-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -269,7 +269,7 @@
// exception ?
continue;
}
- exists = method.getModifiers().contains(Modifier.ABSTRACT);
+ exists = !method.getModifiers().contains(Modifier.ABSTRACT);
// List<? extends TypeParameterElement> typeParameters = method.getTypeParameters();
} else if (ElementKind.FIELD
.equals(childElement.getKind())) {
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-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -266,14 +266,14 @@
if (null != generate) {
component.setComponentClass(new ClassDescription(generate.value()));
component.setBaseClass(baseClass);
- component.setGenerate(false);
+ component.setGenerate(true);
} else if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
// Final component class will be set by validator.
component.setBaseClass(baseClass);
- component.setGenerate(false);
+ component.setGenerate(true);
} else {
component.setComponentClass(baseClass);
- component.setGenerate(true);
+ component.setGenerate(false);
}
}
@@ -342,7 +342,7 @@
attribute.setSuggestedValue(suggestedValue.value());
}
// Flags.
- attribute.setGenerate(!beanProperty.isExists());
+ attribute.setGenerate(!beanProperty.isExists()||null != beanProperty.getAnnotation(Generate.class));
}
// Process XML files with standard attributes definitions.
Attributes attributes = componentElement
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-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -23,11 +23,17 @@
package org.richfaces.cdk.freemarker;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.EventName;
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.Sets;
import freemarker.ext.beans.BeanModel;
import freemarker.ext.beans.BeansWrapper;
@@ -35,16 +41,21 @@
import freemarker.template.TemplateModelException;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
public class ComponentTemplateModel extends BeanModel implements TemplateModel {
private final Component component;
+ private Set<EventName> eventNames;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @param object
* @param wrapper
*/
@@ -55,19 +66,54 @@
@Override
public TemplateModel get(String key) throws TemplateModelException {
- if("generatedAttributes".equals(key)){
+ if ("generatedAttributes".equals(key)) {
return generatedAttributes();
+ } else if ("eventNames".equals(key)) {
+ return eventNames();
+ } else if ("defaultEvent".equals(key)) {
+ return defaultEvent();
}
return super.get(key);
}
- private TemplateModel generatedAttributes() throws TemplateModelException {
- return wrapper.wrap(Collections2.filter(component.getAttributes(), new Predicate<Property>() {
+ private TemplateModel eventNames() throws TemplateModelException {
+ Set<EventName> eventNames = getEventNames();
+ return wrapper.wrap(eventNames);
+ }
+ private TemplateModel defaultEvent() throws TemplateModelException {
+ Set<EventName> names = getEventNames();
+ try{
+ EventName defaultEvent = Iterables.find(names, new Predicate<EventName>() {
+
@Override
- public boolean apply(Property input) {
- return input.isGenerate();
+ public boolean apply(EventName event) {
+ return event.isDefaultEvent();
}
- }));
+ });
+ return wrapper.wrap(defaultEvent);
+ } catch(NoSuchElementException e){
+ return wrapper.wrap(null);
+ }
}
+ private Set<EventName> getEventNames() {
+ if (null == eventNames) {
+ eventNames = Sets.newHashSet();
+ for (Property property : component.getAttributes()) {
+ eventNames.addAll(property.getEventNames());
+ }
+ }
+ return eventNames;
+ }
+
+ private TemplateModel generatedAttributes() throws TemplateModelException {
+ return wrapper.wrap(Collections2.filter(component.getAttributes(),
+ new Predicate<Property>() {
+
+ @Override
+ public boolean apply(Property input) {
+ return input.isGenerate();
+ }
+ }));
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/EventName.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -74,6 +74,10 @@
this.defaultEvent = defaultEvent;
}
+ @Override
+ public String toString() {
+ return name;
+ }
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-08-28 07:18:17 UTC (rev 15386)
@@ -29,28 +29,51 @@
// Import declarations
import javax.annotation.Generated;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import javax.faces.context.FacesContext;
+import javax.faces.component.behavior.ClientBehaviorHolder;
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+
/**
* ${description!}
**/
@Generated({"RicFaces CDK","4.0.0-SNAPSHOT"})
-public class ${componentClass.simpleName} extends ${baseClass} {
+public class ${componentClass.simpleName} extends ${baseClass} <#if (eventNames?size > 0)>implements ClientBehaviorHolder</#if> {
public static final String COMPONENT_TYPE="${type}";
<#if family?exists>
public static final String COMPONENT_FAMILY="${family}";
+
+ @Override
+ public String getFamily() {
+ return (COMPONENT_FAMILY);
+ }
</#if>
+
+ <#if (eventNames?size > 0)>
+ private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(
+ <@concat seq=eventNames ; event>"${event.name}"</@concat>
+ );
+ public Collection<String> getEventNames() {
+ return EVENT_NAMES; }
+
+
+ public String getDefaultEventName() {
+ return <#if defaultEvent?exists>"${defaultEvent.name}"<#else>null</#if>;
+ }
+ </#if>
protected enum Properties {
<@concat seq=generatedAttributes ; attribute>${attribute.name}</@concat>
;
- String toString;
- Properties(String toString) { this.toString = toString; }
- Properties() { }
- public String toString() {
- return ((toString != null) ? toString : super.toString());
- }
}
<#list generatedAttributes as attribute>
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -28,6 +28,7 @@
import java.io.StringWriter;
import java.io.Writer;
+import java.util.Set;
import javax.faces.component.UIOutput;
@@ -41,6 +42,7 @@
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.Component;
import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.EventName;
import org.richfaces.cdk.model.Property;
/**
@@ -50,13 +52,6 @@
*/
public class ComponentClassGeneratorTest extends CdkTestBase {
- /**
- * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#isMyComponent(org.richfaces.cdk.model.Visitable)}.
- */
- @Test
- public void testIsMyComponent() {
- fail("Not yet implemented");
- }
/**
* Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.Component)}.
@@ -86,10 +81,19 @@
attribute.setGenerate(true);
attribute = component.findOrCreateAttribute("id");
attribute.setType(new ClassDescription(String.class));
+ Set<EventName> eventNames = attribute.getEventNames();
+ EventName event = new EventName();
+ event.setName("id");
+ eventNames.add(event);
+ event = new EventName();
+ event.setName("action");
+ event.setDefaultEvent(true);
+ eventNames.add(event);
attribute.setGenerate(false);
generator.visit(component, library);
System.out.println(output);
verify(mockContext);
+ // TODO - check generated file.
}
private CdkContext createMockContext() {
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -25,10 +25,11 @@
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Component;
+import org.richfaces.cdk.annotations.Family;
import org.richfaces.cdk.annotations.Generate;
import java.util.List;
-import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
import javax.faces.component.ValueHolder;
/**
@@ -38,8 +39,8 @@
*/
@Component("org.richfaces.cdk.test.TestComponent")
@Generate("org.richfaces.cdk.test.UITestComponent")
-public abstract class AbstractTestComponent extends UIComponent implements
- ValueHolder {
+@Family("org.richfaces.cdk.test.Test")
+public abstract class AbstractTestComponent extends UIComponentBase {
@Attribute
private int foo;
@@ -54,5 +55,5 @@
* Bar Attribute
*/
@Attribute
- public abstract <M> void setBarValue(List<M> bar);
+ public abstract void setBarValue(List<Object> bar);
}
Added: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java (rev 0)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -0,0 +1,220 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.builder.mojo;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.velocity.VelocityComponent;
+
+/**
+ * @author shura
+ *
+ */
+public abstract class AbstractGenerateMojo extends AbstractMojo {
+
+ /**
+ * Top maven project.
+ *
+ * @parameter expression="${project}"
+ * @readonly
+ */
+ protected MavenProject project;
+ /**
+ *
+ * @parameter
+ */
+ protected String key;
+ /**
+ * Place for component configuration XML files. All '*.xml' files wil be
+ * parsed as components config. All '*.ent' files will be processed as
+ * include configurations.
+ *
+ * @parameter expression="src/main/config/component"
+ */
+ protected File componentConfigDirectory;
+ /**
+ * Place for validator configuration XML files. All '*.xml' files wil be
+ * parsed as component config. All '*.ent' files will be processed as
+ * include configurations.
+ *
+ * @parameter expression="src/main/config/validator"
+ */
+ protected File validatorConfigDirectory;
+
+ /**
+ * Place for converter configuration XML files. All '*.xml' files wil be
+ * parsed as components config. All '*.ent' files will be processed as
+ * include configurations.
+ *
+ * @parameter expression="src/main/config/converter"
+ */
+ protected File converterConfigDirectory;
+
+ /**
+ * Place for faces configuration XML files
+ *
+ * @parameter expression="src/main/config/faces"
+ */
+ protected File facesConfigInclude;
+ /**
+ * Place for component configuration XML files
+ *
+ * @parameter expression="src/main/config/taglib"
+ */
+ protected File taglibInclude;
+ /**
+ * Place for component configuration XML files
+ *
+ * @parameter expression="src/main/config/resources"
+ */
+ protected File resourcesInclude;
+ /**
+ *
+ * @parameter expression="src/main/templates"
+ */
+ protected File templatesDirectory;
+ /**
+ * Directory where the output Java Files will be located.
+ *
+ * @parameter expression="${project.build.directory}/generated-component/java"
+ */
+ protected File outputJavaDirectory;
+
+ /**
+ * @parameter expression="${project.build.directory}/generated-component/test"
+ */
+ protected File outputTestsDirectory;
+
+ /**
+ * Directory where the output Java Files will be located.
+ *
+ * @parameter expression="${project.build.directory}/generated-component/resources"
+ */
+ protected File outputResourcesDirectory;
+
+ /**
+ * @parameter expression="${project.build.directory}/generated-component/test-resources"
+ */
+ protected File outputTestsResourcesDirectory;
+
+
+ /**
+ * @parameter
+ */
+ protected Library library;
+ /**
+ * The source directories containing the sources to be compiled.
+ *
+ * @parameter expression="${project.compileSourceRoots}"
+ * @required
+ * @readonly
+ */
+ protected List<String> compileSourceRoots;
+ /**
+ * Project classpath.
+ *
+ * @parameter expression="${project.compileClasspathElements}"
+ * @required
+ * @readonly
+ */
+ protected List<String> classpathElements;
+ /**
+ * The directory for compiled classes.
+ *
+ * @parameter expression="${project.build.outputDirectory}"
+ * @required
+ * @readonly
+ */
+ protected File outputDirectory;
+
+
+ protected ClassLoader createProjectClassLoader(MavenProject project, boolean useCCL) {
+ ClassLoader classLoader = Thread.currentThread()
+ .getContextClassLoader();
+ try {
+ URL[] urls = new URL[classpathElements.size() + 1];
+ int i = 0;
+ urls[i++] = outputDirectory.toURI().toURL();
+ for (Iterator<?> iter = classpathElements.iterator(); iter
+ .hasNext();) {
+ String element = (String) iter.next();
+ urls[i++] = new File(element).toURI().toURL();
+ }
+
+ if (useCCL) {
+ classLoader = new URLClassLoader(urls, classLoader);
+ } else {
+ classLoader = new URLClassLoader(urls);
+ }
+ } catch (MalformedURLException e) {
+ getLog().error("Bad URL in classpath", e);
+ }
+
+ return classLoader;
+ }
+
+ protected ClassLoader createProjectClassLoader(MavenProject project) {
+ return createProjectClassLoader(project, true);
+ }
+
+ protected String[] doScan(String[] includes, String[] excludes, File rootFolder)
+ throws MojoExecutionException {
+ try {
+ DirectoryScanner directoryScanner = new DirectoryScanner();
+ directoryScanner.setFollowSymlinks(true);
+ directoryScanner.setBasedir(rootFolder);
+ directoryScanner.setExcludes(excludes);
+ directoryScanner.setIncludes(includes);
+ directoryScanner.addDefaultExcludes();
+
+ directoryScanner.scan();
+
+ return directoryScanner.getIncludedFiles();
+ } catch (IllegalStateException e) {
+ throw new MojoExecutionException(
+ "Error scanning source root: \'" + rootFolder + "\'", e );
+ }
+ }
+
+}
Property changes on: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/AbstractGenerateMojo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-08-28 00:57:53 UTC (rev 15385)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-08-28 07:18:17 UTC (rev 15386)
@@ -28,6 +28,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.richfaces.cdk.CdkContextBase;
@@ -82,6 +83,10 @@
context.setOutputFolder(StandardOutputs.FACES_CONFIG, outputResourcesDirectory);
context.setOutputFolder(StandardOutputs.TAG_LIBRARY, outputResourcesDirectory);
context.setOutputFolder(StandardOutputs.XML_SCHEMA, outputResourcesDirectory);
+ if(!outputTestsDirectory.exists()){
+ outputTestsDirectory.mkdirs();
+ }
+ context.setOutputFolder(StandardOutputs.COMPONENT_TEST, outputTestsDirectory);
// TODO - configure.
context.addWorker(NamingConventions.class, new RichFacesConventions(library
.getPrefix()));
@@ -91,10 +96,16 @@
findTemplateFiles());
context.addSources(StandardSources.FACES_CONFIGS,
findFacesConfigFiles());
+
try {
LibraryBuilder builder = LibraryBuilder.createInstance(context);
ComponentLibrary model = builder.buildModel();
builder.generate(model);
+ project.addCompileSourceRoot(outputJavaDirectory.getAbsolutePath());
+ Resource resource = new Resource();
+ resource.setDirectory(outputResourcesDirectory.getAbsolutePath());
+ project.addResource(resource);
+ project.addTestCompileSourceRoot(outputTestsDirectory.getAbsolutePath());
} catch (CdkException e) {
throw new MojoExecutionException("CDK build error", e);
}
14 years, 8 months