2:47 a.m.
Author: alexsmirnov
Date: 2009-05-19 20:47:25 -0400 (Tue, 19 May 2009)
New Revision: 14246
Added:
branches/jsf2.0/cdk/generator/src/main/xjb/
branches/jsf2.0/cdk/generator/src/main/xsd/
branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd
Removed:
branches/jsf2.0/cdk/generator/src/main/java/org/ajax4jsf/builder/ant/
Modified:
branches/jsf2.0/cdk/generator/pom.xml
branches/jsf2.0/cdk/pom.xml
Log:
start converting cdk to jaxb-based parser.
Modified: branches/jsf2.0/cdk/generator/pom.xml
===================================================================
--- branches/jsf2.0/cdk/generator/pom.xml 2009-05-19 22:58:34 UTC (rev 14245)
+++ branches/jsf2.0/cdk/generator/pom.xml 2009-05-20 00:47:25 UTC (rev 14246)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<artifactId>cdk</artifactId>
<groupId>org.richfaces</groupId>
@@ -26,32 +28,27 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.9</version>
</dependency>
<dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- <version>1.4</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6</version>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.10</version>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
<groupId>com.sun.faces</groupId>
- <artifactId>mojarra-jsf-api</artifactId>
+ <artifactId>jsf-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -62,32 +59,17 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.1.GA</version>
</dependency>
<dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>wutka</groupId>
- <artifactId>dtdparser</artifactId>
- <version>1.21</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Added: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd
===================================================================
--- branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd (rev 0)
+++ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-20 00:47:25 UTC (rev
14246)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://richfaces.org/cdk"
+ elementFormDefault="qualified"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:cdk="http://richfaces.org/cdk"
attributeFormDefault="unqualified">
+ <xsd:annotation>
+ <xsd:documentation>$Id$</xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:element name="components"
type="xsd:string"></xsd:element>
+
+ <xsd:complexType name="componentsType">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="component"
type="cdk:componentType"></xsd:element>
+ <xsd:element name="renderer"
type="xsd:string"></xsd:element>
+ <xsd:element name="listener"
type="xsd:string"></xsd:element>
+ <xsd:element name="behavior"
type="xsd:string"></xsd:element>
+ <xsd:element name="validator"
type="xsd:string"></xsd:element>
+ <xsd:element name="converter"
type="xsd:string"></xsd:element>
+ <xsd:element name="function"
type="xsd:string"></xsd:element>
+ </xsd:choice>
+ <xsd:attribute name="id"
type="xsd:ID"></xsd:attribute>
+ <xsd:attribute name="version"
+ type="cdk:components-versionType">
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:simpleType name="components-versionType">
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="4.0"></xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="cdk-object-type">
+ <xsd:attribute name="id"
type="xsd:ID"></xsd:attribute>
+ <xsd:attribute name="generate"
type="xsd:boolean"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="componentType">
+ <xsd:complexContent>
+ <xsd:extension base="cdk:cdk-object-type"></xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:simpleType name="javaType">
+ <xsd:restriction base="xsd:token"></xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="classnameType">
+ <xsd:simpleContent>
+ <xsd:restriction
base="cdk:javaType"></xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+</xsd:schema>
\ No newline at end of file
Property changes on: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/jsf2.0/cdk/pom.xml
===================================================================
--- branches/jsf2.0/cdk/pom.xml 2009-05-19 22:58:34 UTC (rev 14245)
+++ branches/jsf2.0/cdk/pom.xml 2009-05-20 00:47:25 UTC (rev 14246)
@@ -10,22 +10,6 @@
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JSF Components Development kit</name>
- <dependencies />
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<modules>
<module>generator</module>
<module>maven-cdk-plugin</module>
@@ -33,35 +17,6 @@
<module>maven-archetype-jsf-component</module>
<module>maven-archetype-jsfwebapp</module>
<module>maven-archetype-plug-n-skin</module>
-
</modules>
-
- <profiles>
- <profile>
- <id>clover</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <includesAllSourceRoots>
- false
- </includesAllSourceRoots>
- <includesTestSourceRoots>
- false
- </includesTestSourceRoots>
- <jdk>1.5</jdk>
-
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file