Author: Alex.Kolonitsky Date: 2010-08-10 10:35:38 -0400 (Tue, 10 Aug 2010) New Revision: 18534 Removed: trunk/ui/core/bom/ trunk/ui/core/parent/ trunk/ui/dist/bom/ trunk/ui/dist/parent/ Modified: trunk/pom.xml trunk/ui/core/pom.xml trunk/ui/core/ui/pom.xml trunk/ui/dist/pom.xml trunk/ui/dist/richfaces-components-ui/pom.xml trunk/ui/parent/pom.xml Log: Richfaces 4.0 restructurization of svn repository structure Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -28,7 +28,7 @@ <module>ui/iteration</module> <module>ui/misc</module> <module>ui/output</module> - <!--<module>ui/dist</module>--> + <module>ui/dist</module> <!-- Remaining --> <module>archetypes</module> Modified: trunk/ui/core/pom.xml =================================================================== --- trunk/ui/core/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/ui/core/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -35,8 +35,6 @@ <name>Richfaces UI Components: Core Aggregator</name> <modules> - <module>bom</module> - <module>parent</module> <module>ui</module> </modules> Modified: trunk/ui/core/ui/pom.xml =================================================================== --- trunk/ui/core/ui/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/ui/core/ui/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -1,128 +1,127 @@ +<!-- + 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. + --> - <!-- - 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/maven-v4_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/maven-v4_0_0.xsd"> + <parent> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> - <parent> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <name>Richfaces UI Components: Core UI</name> + <packaging>jar</packaging> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> - <name>Richfaces UI Components: Core UI</name> - <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> + <!-- runtime --> + <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> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - </plugin> - </plugins> - </build> - <dependencies> - <!-- runtime --> - <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.cdk</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> + <!-- JSF with dependencies --> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> - <!-- JSF with dependencies --> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> + <!-- tests --> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <!-- todo api? --> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <!-- tests --> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <!-- todo api? --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/c... - </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/c... + </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + </developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: trunk/ui/dist/pom.xml =================================================================== --- trunk/ui/dist/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/ui/dist/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -32,7 +32,7 @@ <name>Richfaces UI Assembler</name> <modules> - <module>bom</module> + <!--<module>bom</module>--> <!--<module>parent</module>--> <module>richfaces-components-api</module> <module>richfaces-components-impl</module> Modified: trunk/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -25,7 +25,6 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> Modified: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2010-08-10 12:56:40 UTC (rev 18533) +++ trunk/ui/parent/pom.xml 2010-08-10 14:35:38 UTC (rev 18534) @@ -37,9 +37,13 @@ <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> + <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> + <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> + <org.richfaces.ui.misc.version>4.0.0-SNAPSHOT</org.richfaces.ui.misc.version> + <org.richfaces.ui.iteration.version>4.0.0-SNAPSHOT</org.richfaces.ui.iteration.version> + <org.richfaces.ui.output.version>4.0.0-SNAPSHOT</org.richfaces.ui.output.version> </properties> <dependencyManagement> @@ -51,8 +55,21 @@ <scope>import</scope> <type>pom</type> </dependency> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-bom</artifactId> + <version>${org.richfaces.commons.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>#{org.richfaces.ui.core.version}</version> + </dependency> + + <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> <version>${project.version}</version> @@ -64,19 +81,29 @@ </dependency> <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> - <version>${org.richfaces.ui.core.version}</version> - <scope>import</scope> - <type>pom</type> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> <version>${org.richfaces.cdk.version}</version> </dependency> </dependencies> + </dependencyManagement> <build>