Author: abelevich Date: 2010-05-17 13:21:28 -0400 (Mon, 17 May 2010) New Revision: 17088 Modified: root/ui-sandbox/componentcontrol/trunk/api/pom.xml root/ui-sandbox/componentcontrol/trunk/bom/pom.xml root/ui-sandbox/componentcontrol/trunk/parent/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/componentcontrol/trunk/ui/pom.xml Log: fix poms Modified: root/ui-sandbox/componentcontrol/trunk/api/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/api/pom.xml 2010-05-17 16:43:27 UTC (rev 17087) +++ root/ui-sandbox/componentcontrol/trunk/api/pom.xml 2010-05-17 17:21:28 UTC (rev 17088) @@ -25,14 +25,14 @@ <parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-parent</artifactId> + <artifactId>component-control-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>component-control-api</artifactId> - <name>Richfaces UI Components: component control API</name> + <name>Richfaces UI Components: Component Control API</name> <packaging>jar</packaging> <dependencies> Modified: root/ui-sandbox/componentcontrol/trunk/bom/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-17 16:43:27 UTC (rev 17087) +++ root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-17 17:21:28 UTC (rev 17088) @@ -31,9 +31,9 @@ </parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-bom</artifactId> + <artifactId>component-control-bom</artifactId> <version>4.0.0-SNAPSHOT</version> - <name>Richfaces UI Components: Tables BOM</name> + <name>Richfaces UI Components: Component Control BOM</name> <packaging>pom</packaging> <properties> @@ -49,16 +49,13 @@ <scope>import</scope> <type>pom</type> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-api</artifactId> - <version>${richfaces.core.api.version}</version> - </dependency> - - - <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-api</artifactId> + <version>${richfaces.core.api.version}</version> + </dependency> + <dependency> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>component-control-api</artifactId> <version>${project.version}</version> Modified: root/ui-sandbox/componentcontrol/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-17 16:43:27 UTC (rev 17087) +++ root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-17 17:21:28 UTC (rev 17088) @@ -26,38 +26,68 @@ <parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-bom</artifactId> + <artifactId>component-control-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - + + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>component-control-parent</artifactId> + <name>Richfaces UI Components: Component Control Parent Module</name> + <packaging>pom</packaging> + <modules> <!--module>../api</module--> <module>../ui</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>component-control-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-parent</artifactId> - <name>Richfaces UI Components: Tables Parent Module</name> - <packaging>pom</packaging> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossrichfaces/downloads - </downloadUrl> - <repository> - <id>jboss-releases-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>jboss-snapshots-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - </distributionManagement> + <!-- Archetypes dependency --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> - <build> + <!-- tests --> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> <pluginManagement> <plugins> <plugin> @@ -100,9 +130,9 @@ <library> <prefix>org.richfaces</prefix> <taglib> - <uri>http://richfaces.org/tables</uri> - <shortName>tables</shortName> - <displayName>Table components tags</displayName> + <uri>http://richfaces.org/componentControl</uri> + <shortName>ds</shortName> + <displayName>Component Control tag</displayName> </taglib> </library> </configuration> @@ -118,44 +148,4 @@ </plugin> </plugins> </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - </dependencies> - </dependencyManagement> - </project> Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-17 16:43:27 UTC (rev 17087) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-17 17:21:28 UTC (rev 17088) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> + <!-- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc. and individual contributors by the @authors tag. See the @@ -18,16 +19,28 @@ http://www.fsf.org. --> -<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"> <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>components</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Richfaces UI Components: componentControl Aggregator</name> + <artifactId>component-control-aggregator</artifactId> + <packaging>pom</packaging> + <name>Richfaces UI Components: Component Control Aggregator</name> + <modules> + <module>bom</module> + <module>parent</module> + </modules> + <build> <plugins> <plugin> @@ -41,9 +54,4 @@ </plugins> </build> - <modules> - <module>bom</module> - <module>parent</module> - </modules> - </project> \ No newline at end of file Modified: root/ui-sandbox/componentcontrol/trunk/ui/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/ui/pom.xml 2010-05-17 16:43:27 UTC (rev 17087) +++ root/ui-sandbox/componentcontrol/trunk/ui/pom.xml 2010-05-17 17:21:28 UTC (rev 17088) @@ -25,42 +25,32 @@ <parent> <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>componentControl-parent</artifactId> + <artifactId>component-control-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>component-control-ui</artifactId> - <name>Richfaces UI Components: Tables UI</name> + <name>Richfaces UI Components: Component Control UI</name> <packaging>jar</packaging> <dependencies> - <dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-api</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> + <!--dependency> + <groupId>org.richfaces.ui-sandbox</groupId> + <artifactId>component-control-api</artifactId> + </dependency--> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - </dependency> - <dependency> - <!-- todo remove this dependency or move to test scope --> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-api</artifactId> - </dependency> - <!-- JSF with dependencies --> <dependency> <groupId>com.sun.faces</groupId>