[richfaces-svn-commits] JBoss Rich Faces SVN: r18515 - in trunk/ui: iteration/ui and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 9 12:00:25 EDT 2010
Author: Alex.Kolonitsky
Date: 2010-08-09 12:00:24 -0400 (Mon, 09 Aug 2010)
New Revision: 18515
Modified:
trunk/ui/iteration/api/pom.xml
trunk/ui/iteration/ui/pom.xml
trunk/ui/misc/ui/pom.xml
trunk/ui/parent/pom.xml
Log:
Richfaces 4.0 restructurization of svn repository structure
Modified: trunk/ui/iteration/api/pom.xml
===================================================================
--- trunk/ui/iteration/api/pom.xml 2010-08-09 15:46:51 UTC (rev 18514)
+++ trunk/ui/iteration/api/pom.xml 2010-08-09 16:00:24 UTC (rev 18515)
@@ -22,16 +22,15 @@
<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.ui.iteration</groupId>
- <artifactId>datascroller-aggregator</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-api</artifactId>
- <name>Richfaces UI Components: Datascroller API</name>
+ <artifactId>richfaces-ui-iteration-api</artifactId>
+ <name>Richfaces UI Components: Iteration API</name>
<packaging>jar</packaging>
<dependencies>
Modified: trunk/ui/iteration/ui/pom.xml
===================================================================
--- trunk/ui/iteration/ui/pom.xml 2010-08-09 15:46:51 UTC (rev 18514)
+++ trunk/ui/iteration/ui/pom.xml 2010-08-09 16:00:24 UTC (rev 18515)
@@ -24,15 +24,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-aggregator</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-ui</artifactId>
- <name>Richfaces UI Components: Datascroller UI</name>
+ <artifactId>richfaces-ui-iteration-ui</artifactId>
+ <name>Richfaces UI Components: Iteration UI</name>
<packaging>jar</packaging>
<build>
<plugins>
@@ -62,7 +61,7 @@
<dependency>
<groupId>org.richfaces.ui.iteration</groupId>
- <artifactId>datascroller-api</artifactId>
+ <artifactId>richfaces-ui-iteration-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/ui/misc/ui/pom.xml
===================================================================
--- trunk/ui/misc/ui/pom.xml 2010-08-09 15:46:51 UTC (rev 18514)
+++ trunk/ui/misc/ui/pom.xml 2010-08-09 16:00:24 UTC (rev 18515)
@@ -17,15 +17,15 @@
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">
+<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.ui.misc</groupId>
- <artifactId>richfaces-ui-misc-assembler</artifactId>
+ <artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.misc</groupId>
@@ -41,20 +41,6 @@
</properties>
<dependencies>
- <!-- artifacts for aggregation -->
- <dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>componentcontrol-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>functions-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>jquery-ui</artifactId>
- </dependency>
-
<!-- artifacts for javadoc generation -->
<dependency>
<groupId>${jsf2.api.groupid}</groupId>
@@ -65,9 +51,14 @@
<artifactId>annotations</artifactId>
<version>${org.richfaces.cdk.version}</version>
</dependency>
-
- <!-- JSF with dependencies -->
<dependency>
+ <groupId>org.richfaces.ui.core</groupId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
<groupId>${jsf2.api.groupid}</groupId>
<artifactId>${jsf2.api.artifactid}</artifactId>
<scope>provided</scope>
@@ -92,7 +83,7 @@
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- tests -->
<dependency>
<groupId>${jsf2.impl.groupid}</groupId>
@@ -124,7 +115,7 @@
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-mock</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<profiles>
@@ -153,46 +144,46 @@
</execution>
</executions>
</plugin>
-<!--
+ <!--
+ <plugin>
+ <!– collecting jsdoc –>
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jsdoc</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputBaseDirectory>${basedir}/target</outputBaseDirectory>
+ <jsDir>${basedir}/target/dependency</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ <goals>
+ <goal>jsdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!– pack jsdoc to jar –>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-jsodcs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classesDirectory>${basedir}/target/jsdoc</classesDirectory>
+ <classifier>jsdoc</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
<plugin>
- <!– collecting jsdoc –>
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <executions>
- <execution>
- <id>jsdoc</id>
- <phase>prepare-package</phase>
- <configuration>
- <outputBaseDirectory>${basedir}/target</outputBaseDirectory>
- <jsDir>${basedir}/target/dependency</jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- <goals>
- <goal>jsdoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!– pack jsdoc to jar –>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>pack-jsodcs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classesDirectory>${basedir}/target/jsdoc</classesDirectory>
- <classifier>jsdoc</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
- <plugin>
<!-- collecting javadoc -->
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
@@ -205,12 +196,12 @@
</goals>
<configuration>
<sourcepath>${basedir}/target/dependency</sourcepath>
-<!--
- <includeDependencySources>true</includeDependencySources>
- <dependencySourceIncludes>
- <dependencySourceInclude>${assembly.projects.group}:*-ui:*</dependencySourceInclude>
- </dependencySourceIncludes>
--->
+ <!--
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>${assembly.projects.group}:*-ui:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ -->
</configuration>
</execution>
</executions>
@@ -219,10 +210,12 @@
</build>
</profile>
</profiles>
-
+
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richfaces-ui-misc-ui</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richfaces-ui-misc-ui</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richfaces-ui-misc-ui
+ </connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/dist/richfaces-ui-misc-ui
+ </developerConnection>
<url>http://fisheye.jboss.org/browse/richfaces/</url>
</scm>
</project>
\ No newline at end of file
Modified: trunk/ui/parent/pom.xml
===================================================================
--- trunk/ui/parent/pom.xml 2010-08-09 15:46:51 UTC (rev 18514)
+++ trunk/ui/parent/pom.xml 2010-08-09 16:00:24 UTC (rev 18515)
@@ -29,13 +29,14 @@
<version>9</version>
</parent>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>richfaces-ui-misc-parent</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Miscellanous Parent</name>
<packaging>pom</packaging>
<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>
@@ -71,11 +72,6 @@
</dependency>
<dependency>
- <groupId>org.richfaces.ui.misc</groupId>
- <artifactId>richfaces-ui-misc-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
<version>${org.richfaces.cdk.version}</version>
@@ -151,8 +147,88 @@
</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>
+
+ <!-- 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>
+
<profiles>
<profile>
<id>release</id>
More information about the richfaces-svn-commits
mailing list