Author: nbelaevski Date: 2010-05-26 13:14:58 -0400 (Wed, 26 May 2010) New Revision: 17282 Added: root/ui/iteration/trunk/dataScroller/api/ root/ui/iteration/trunk/dataScroller/pom.xml root/ui/iteration/trunk/dataScroller/ui/ Removed: root/ui-sandbox/datascroller/trunk/api/ root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/datascroller/trunk/ui/ Modified: root/examples-sandbox/trunk/components/tables/pom.xml root/examples/richfaces-showcase/trunk/pom.xml root/ui-sandbox/pom.xml root/ui/iteration/trunk/bom/pom.xml root/ui/iteration/trunk/dataScroller/api/pom.xml root/ui/iteration/trunk/dataScroller/ui/pom.xml root/ui/iteration/trunk/pom.xml Log: https://jira.jboss.org/browse/RF-8668 Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -22,6 +22,12 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-core-api</artifactId> </dependency> + + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-ui</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -47,11 +53,6 @@ <artifactId>tables-ui</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-ui</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> </dependencies> <build> Modified: root/examples-sandbox/trunk/components/tables/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -31,8 +31,8 @@ <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-bom</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <scope>import</scope> <type>pom</type> @@ -41,6 +41,14 @@ </dependencyManagement> <dependencies> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-ui</artifactId> + </dependency> <dependency> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-ui</artifactId> @@ -53,14 +61,6 @@ <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-impl</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-ui</artifactId> - </dependency> <!-- API implementation for runtime --> <dependency> Modified: root/ui/iteration/trunk/bom/pom.xml =================================================================== --- root/ui/iteration/trunk/bom/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/ui/iteration/trunk/bom/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -37,7 +37,7 @@ <packaging>pom</packaging> <properties> - <richfaces.iteration.version>4.0.0-SNAPSHOT</richfaces.iteration.version> + <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> </properties> <dependencyManagement> @@ -45,12 +45,22 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.iteration.version}</version> + <version>${richfaces.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> <version>${project.version}</version> Copied: root/ui/iteration/trunk/dataScroller/api (from rev 17277, root/ui-sandbox/datascroller/trunk/api) Modified: root/ui/iteration/trunk/dataScroller/api/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/api/pom.xml 2010-05-26 16:24:37 UTC (rev 17277) +++ root/ui/iteration/trunk/dataScroller/api/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -24,13 +24,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-parent</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui-sandbox</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-api</artifactId> <name>Richfaces UI Components: Datascroller API</name> <packaging>jar</packaging> Copied: root/ui/iteration/trunk/dataScroller/pom.xml (from rev 17277, root/ui-sandbox/datascroller/trunk/pom.xml) =================================================================== --- root/ui/iteration/trunk/dataScroller/pom.xml (rev 0) +++ root/ui/iteration/trunk/dataScroller/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -0,0 +1,43 @@ +<?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 + 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. +--> + +<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</groupId> + <artifactId>richfaces-parent</artifactId> + <version>5</version> + </parent> + + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-aggregator</artifactId> + <packaging>pom</packaging> + <name>Richfaces UI Components: Datascroller Aggregator</name> + + <modules> + <module>api</module> + <module>ui</module> + </modules> +</project> \ No newline at end of file Copied: root/ui/iteration/trunk/dataScroller/ui (from rev 17277, root/ui-sandbox/datascroller/trunk/ui) Modified: root/ui/iteration/trunk/dataScroller/ui/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/pom.xml 2010-05-26 16:24:37 UTC (rev 17277) +++ root/ui/iteration/trunk/dataScroller/ui/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -26,12 +26,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-parent</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <groupId>org.richfaces.ui-sandbox</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-ui</artifactId> <name>Richfaces UI Components: Datascroller UI</name> <packaging>jar</packaging> @@ -44,7 +44,7 @@ </dependency> <dependency> - <groupId>org.richfaces.ui-sandbox</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>datascroller-api</artifactId> </dependency> Modified: root/ui/iteration/trunk/pom.xml =================================================================== --- root/ui/iteration/trunk/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/ui/iteration/trunk/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -39,5 +39,6 @@ <modules> <module>bom</module> <module>parent</module> + <module>dataScroller</module> </modules> </project> \ No newline at end of file Deleted: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -1,45 +0,0 @@ -<?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 - 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. ---> - -<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</groupId> - <artifactId>richfaces-parent</artifactId> - <version>5</version> - </parent> - - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-aggregator</artifactId> - <packaging>pom</packaging> - <name>Richfaces UI Components: Datascroller Aggregator</name> - - <modules> - <module>bom</module> - <module>parent</module> - <module>api</module> - <module>ui</module> - </modules> -</project> \ No newline at end of file Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-26 16:48:22 UTC (rev 17281) +++ root/ui-sandbox/pom.xml 2010-05-26 17:14:58 UTC (rev 17282) @@ -37,7 +37,6 @@ <modules> <module>tables/trunk</module> - <module>datascroller/trunk</module> <module>componentcontrol/trunk</module> </modules> </project> \ No newline at end of file