[richfaces-svn-commits] JBoss Rich Faces SVN: r14716 - in branches/sandbox/rf4_build: examples/trunk and 5 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Jun 24 12:59:20 EDT 2009
Author: abelevich
Date: 2009-06-24 12:59:20 -0400 (Wed, 24 Jun 2009)
New Revision: 14716
Removed:
branches/sandbox/rf4_build/ui/trunk/components/tree/shared/
Modified:
branches/sandbox/rf4_build/docs/trunk/pom.xml
branches/sandbox/rf4_build/examples/trunk/components/pom.xml
branches/sandbox/rf4_build/examples/trunk/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml
branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
Log:
new build system
Modified: branches/sandbox/rf4_build/docs/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -4,17 +4,230 @@
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>version-matrix</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>docs</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <docs.version>${project.version}</docs.version>
+ <docs.translation>en</docs.translation>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>snapshots.jboss.org</id>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.docs.guides.testguide</groupId>
+ <artifactId>${docs.translation}</artifactId>
+ <version>${docs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.docs.commons</groupId>
+ <artifactId>highlight</artifactId>
+ <version>${docs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.docs.commons.resources</groupId>
+ <artifactId>${docs.translation}</artifactId>
+ <version>${docs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.wst.sse</groupId>
+ <artifactId>core</artifactId>
+ <version>1.1.202-v200709061102</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>org.apache</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bundle</artifactId>
+ <groupId>system</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>core</artifactId>
+ <groupId>org.eclipse.wst.xml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>runtime</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>resources</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>filebuffers</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commands</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>common</artifactId>
+ <groupId>org.eclipse.emf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>icu</artifactId>
+ <groupId>com.ibm</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.wst.css</groupId>
+ <artifactId>core</artifactId>
+ <version>1.1.101-v200705302225</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>org.apache</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bundle</artifactId>
+ <groupId>system</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>core</artifactId>
+ <groupId>org.eclipse.wst.xml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>runtime</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>resources</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>filebuffers</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>text</artifactId>
+ <groupId>org.eclipse</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commands</artifactId>
+ <groupId>org.eclipse.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>common</artifactId>
+ <groupId>org.eclipse.emf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>icu</artifactId>
+ <groupId>com.ibm</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.uwyn</groupId>
+ <artifactId>jhighlight</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>0.95</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.docs.commons.resources</groupId>
+ <artifactId>${docs.translation}</artifactId>
+ <version>${docs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<modules>
<module>commons</module>
<module>guides</module>
Modified: branches/sandbox/rf4_build/examples/trunk/components/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -20,5 +20,15 @@
<module>panel-demo</module>
<module>tree-demo</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui.components</groupId>
+ <artifactId>${example.componentName}-ui</artifactId>
+ <version>${ui.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/examples/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -32,11 +32,13 @@
<artifactId>richfaces-impl</artifactId>
<version>${framework.version}</version>
</dependency>
- <dependency>
+
+ <!-- TODO: uncomment when assembly will be ready -->
+ <!--dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
<version>${ui.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
@@ -73,17 +75,7 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
-
- <!-- TODO: uncomment when assembly will be ready -->
- <!-- dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- </dependency -->
- </dependencies>
+ </dependencies>
<modules>
<module>components</module>
Modified: branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -16,8 +16,9 @@
<packaging>pom</packaging>
<modules>
- <module>calendar-api</module>
- <module>calendarf-ui</module>
+ <module>api</module>
+ <module>ui</module>
+ <module>impl</module>
</modules>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/components/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui</groupId>
- <artifactId>components</artifactId>
+ <artifactId>richfaces-ui</artifactId>
<packaging>pom</packaging>
<modules>
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -16,8 +16,12 @@
<packaging>pom</packaging>
<modules>
- <module>tree-api</module>
- <module>tree-ui</module>
+ <module>tree/api</module>
+ <module>tree/ui</module>
+ <module>treeModel/api</module>
+ <module>treeModel/ui</module>
+ <module>treeShared/api</module>
+ <module>treeShared/ui</module>
</modules>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-24 16:33:49 UTC (rev 14715)
+++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-24 16:59:20 UTC (rev 14716)
@@ -21,15 +21,8 @@
<framework.version>${project.version}</framework.version>
<ui.version>${project.version}</ui.version>
<cdk.version>${project.version}</cdk.version>
- <docs.version>${project.version}</docs.version>
- <docs.translation>en</docs.translation>
+ </properties>
- <!--
- Referenced property: example.componentName - is redefined by
- downstream example project
- -->
- </properties>
-
<repositories>
<repository>
<id>repository.jboss.org</id>
@@ -103,36 +96,7 @@
<version>${framework.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- TODO: we may remove this now -->
- <dependency>
- <groupId>org.richfaces.ui.components</groupId>
- <artifactId>${example.componentName}-ui</artifactId>
- <version>${ui.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${ui.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.docs.guides.testguide</groupId>
- <artifactId>${docs.translation}</artifactId>
- <version>${docs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.docs.commons</groupId>
- <artifactId>highlight</artifactId>
- <version>${docs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.docs.commons.resources</groupId>
- <artifactId>${docs.translation}</artifactId>
- <version>${docs.version}</version>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${jsf.version}</version>
@@ -171,121 +135,6 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
- <!-- -->
-
- <!-- TODO: move to separate version matrix -->
- <!-- Documentation dependencies -->
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.7</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.sse</groupId>
- <artifactId>core</artifactId>
- <version>1.1.202-v200709061102</version>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>org.apache</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bundle</artifactId>
- <groupId>system</groupId>
- </exclusion>
- <exclusion>
- <artifactId>core</artifactId>
- <groupId>org.eclipse.wst.xml</groupId>
- </exclusion>
- <exclusion>
- <artifactId>runtime</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>resources</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>filebuffers</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>text</artifactId>
- <groupId>org.eclipse</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commands</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>common</artifactId>
- <groupId>org.eclipse.emf</groupId>
- </exclusion>
- <exclusion>
- <artifactId>icu</artifactId>
- <groupId>com.ibm</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.css</groupId>
- <artifactId>core</artifactId>
- <version>1.1.101-v200705302225</version>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>org.apache</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bundle</artifactId>
- <groupId>system</groupId>
- </exclusion>
- <exclusion>
- <artifactId>core</artifactId>
- <groupId>org.eclipse.wst.xml</groupId>
- </exclusion>
- <exclusion>
- <artifactId>runtime</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>resources</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>filebuffers</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>text</artifactId>
- <groupId>org.eclipse</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commands</artifactId>
- <groupId>org.eclipse.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>common</artifactId>
- <groupId>org.eclipse.emf</groupId>
- </exclusion>
- <exclusion>
- <artifactId>icu</artifactId>
- <groupId>com.ibm</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>0.95</version>
- </dependency>
- <!-- -->
-
<!-- Archetypes dependency -->
<dependency>
<groupId>org.apache.maven.archetype</groupId>
@@ -316,37 +165,6 @@
<version>2.0-alpha-4</version>
<extensions>true</extensions>
</plugin>
-
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
- <groupId>org.richfaces.docs.commons.resources</groupId>
- <artifactId>${docs.translation}</artifactId>
- <version>${docs.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.7</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</pluginManagement>
More information about the richfaces-svn-commits
mailing list