Author: alexsmirnov Date: 2010-08-12 19:45:02 -0400 (Thu, 12 Aug 2010) New Revision: 18608 Modified: branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml branches/cdk-8570/cdk/parent/pom.xml Log: Modified: branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml =================================================================== --- branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-08-12 23:43:13 UTC (rev 18607) +++ branches/cdk-8570/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-08-12 23:45:02 UTC (rev 18608) @@ -8,8 +8,6 @@ <cdk:superclass>javax.faces.render.Renderer</cdk:superclass> <cdk:component-family>org.richfaces.cdk.test.Test </cdk:component-family> - <cdk:component-type>org.richfaces.cdk.test.TestComponent - </cdk:component-type> <cdk:renderer-type>org.richfaces.TestRenderer</cdk:renderer-type> <cdk:renderkit-id>RF4_XHTML</cdk:renderkit-id> <cdk:renders-children>false</cdk:renders-children> Modified: branches/cdk-8570/cdk/parent/pom.xml =================================================================== --- branches/cdk-8570/cdk/parent/pom.xml 2010-08-12 23:43:13 UTC (rev 18607) +++ branches/cdk-8570/cdk/parent/pom.xml 2010-08-12 23:45:02 UTC (rev 18608) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>9</version> + </parent> <modelVersion>4.0.0</modelVersion> @@ -19,7 +20,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/... @@ -153,227 +154,230 @@ </plugins> </pluginManagement> </build> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <version>${jsf2.api.version}</version> + </dependency> - <!-- TODO remove duplicates from these dependences already defined in - project BOM --> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - <version>1.0_02.CR4</version> - </dependency> - <!-- Common libraries --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>com.sun.xsom</groupId> - <artifactId>xsom</artifactId> - <version>20081112</version> - </dependency> - <dependency> - <groupId>com.googlecode.functional-collections</groupId> - <artifactId>functional-collections</artifactId> - <version>1.1.7</version> - <exclusions> - <exclusion> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>r05</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-grapher</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assisted-inject</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-guice</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.9</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>1.0_02.CR4</version> + </dependency> + <!-- Common libraries --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>com.sun.xsom</groupId> + <artifactId>xsom</artifactId> + <version>20081112</version> + </dependency> + <dependency> + <groupId>com.googlecode.functional-collections</groupId> + <artifactId>functional-collections</artifactId> + <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r05</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-grapher</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assisted-inject</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-guice</artifactId> + <version>2.2.0</version> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.9</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> - <!-- Tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.5.2</version> - <scope>test</scope> - </dependency> - <!-- Maven --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>2.0.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>2.0.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.10</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>file-management</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>com.google.code.javaparser</groupId> - <artifactId>javaparser</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> - <!-- Projects --> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>commons</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>attributes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>xinclude</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>generator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.5.2</version> + <scope>test</scope> + </dependency> + <!-- Maven --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.10</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>file-management</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.1</version> + <scope>test</scope> + </dependency> + <!-- Projects --> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>commons</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>attributes</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>xinclude</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>generator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <reporting> <plugins> <plugin>