richfaces-svn-commits
June 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 254 discussions
JBoss Rich Faces SVN: r17472 - in root: build/resources/trunk and 44 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-06-02 16:06:12 -0400 (Wed, 02 Jun 2010)
New Revision: 17472
Added:
root/build/resources/trunk/release.sh
Modified:
root/build/bom/trunk/pom.xml
root/build/resources/trunk/clean_install.sh
root/cdk/trunk/archetypes/ui-multimodule/pom.xml
root/cdk/trunk/archetypes/ui-singlemodule/pom.xml
root/cdk/trunk/bom/pom.xml
root/cdk/trunk/parent/pom.xml
root/cdk/trunk/plugins/commons/pom.xml
root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml
root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml
root/cdk/trunk/pom.xml
root/commons/trunk/api/pom.xml
root/commons/trunk/bom/pom.xml
root/commons/trunk/parent/pom.xml
root/core/trunk/api/pom.xml
root/core/trunk/bom/pom.xml
root/core/trunk/impl/pom.xml
root/core/trunk/parent/pom.xml
root/ui/core/trunk/bom/pom.xml
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
root/ui/core/trunk/ui/pom.xml
root/ui/dist/trunk/assembler.xml
root/ui/dist/trunk/pom.xml
root/ui/dist/trunk/richfaces-components-api/pom.xml
root/ui/dist/trunk/richfaces-components-impl/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/iteration/trunk/bom/pom.xml
root/ui/iteration/trunk/datascroller/api/pom.xml
root/ui/iteration/trunk/datascroller/pom.xml
root/ui/iteration/trunk/datascroller/ui/pom.xml
root/ui/iteration/trunk/dist/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/iteration/trunk/parent/pom.xml
root/ui/iteration/trunk/pom.xml
root/ui/iteration/trunk/tables/api/pom.xml
root/ui/iteration/trunk/tables/impl/pom.xml
root/ui/iteration/trunk/tables/pom.xml
root/ui/iteration/trunk/tables/ui/pom.xml
root/ui/misc/trunk/bom/pom.xml
root/ui/misc/trunk/componentcontrol/pom.xml
root/ui/misc/trunk/dist/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
root/ui/misc/trunk/functions/pom.xml
root/ui/misc/trunk/parent/pom.xml
root/ui/misc/trunk/pom.xml
Log:
RF-8460 Major update to pom.xml files to support release procedure
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/build/bom/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -38,68 +38,11 @@
<url>http://www.jboss.org/richfaces</url>
<properties>
- <!-- RichFaces Modules Versions -->
- <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
- <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
- <richfaces.ui.core.version>4.0.0-SNAPSHOT</richfaces.ui.core.version>
- <richfaces.ui.input.version>4.0.0-SNAPSHOT</richfaces.ui.input.version>
- <richfaces.ui.output.version>4.0.0-SNAPSHOT</richfaces.ui.output.version>
- <richfaces.ui.iteration.version>4.0.0-SNAPSHOT</richfaces.ui.iteration.version>
- <richfaces.ui.misc.version>4.0.0-SNAPSHOT</richfaces.ui.misc.version>
</properties>
<!-- Runtime dependency management -->
<dependencyManagement>
<dependencies>
- <!-- RichFaces -->
- <dependency>
- <groupId>org.richfaces.commons</groupId>
- <artifactId>richfaces-commons-api</artifactId>
- <version>${richfaces.commons.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-api</artifactId>
- <version>${richfaces.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>${richfaces.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>${richfaces.ui.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>input</artifactId>
- <version>${richfaces.ui.input.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>output</artifactId>
- <version>${richfaces.ui.output.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>iteration</artifactId>
- <version>${richfaces.ui.iteration.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>misc</artifactId>
- <version>${richfaces.ui.misc.version}</version>
- </dependency>
-
<!-- JSF 2 -->
<!--
This is set by default above, but can be overwritten by profiles
Modified: root/build/resources/trunk/clean_install.sh
===================================================================
--- root/build/resources/trunk/clean_install.sh 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/build/resources/trunk/clean_install.sh 2010-06-02 20:06:12 UTC (rev 17472)
@@ -105,6 +105,8 @@
"core/trunk"
"ui/core/trunk"
"ui/misc/trunk"
+ "ui/iteration/trunk"
+ "ui/dist/trunk"
# other ui modules when in place
# TODO NOT SURE WHAT TO DO WITH /DISTS
)
Added: root/build/resources/trunk/release.sh
===================================================================
--- root/build/resources/trunk/release.sh (rev 0)
+++ root/build/resources/trunk/release.sh 2010-06-02 20:06:12 UTC (rev 17472)
@@ -0,0 +1,202 @@
+#!/bin/sh
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+** WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS **
+
+This script will release all modules in RichFaces 4.0 distributions. WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS
+
+BASIC OPTIONS:
+ -h Show this message
+ -b Root directory, otherwise the PWD is used
+ -x Use mvn -X option
+
+Rules:
+- Modules should only import other modules bom's for versions, not set specific version themselves
+- All interproject versions must be set with variables in the for of: <version_prop>.version
+ - Example: "org.richfaces.commons.version"
+ - <version_prop> is set in the array below
+- All sub-modules of a single t/b/t module must share versions
+ - Setting <autoVersionSubmodules> to true
+- <parent> references within the same module must use <relativePath>
+ - This is needed because during release prepare the module parent is not installed
+ - For example: commons-api must reference commons-parent as ../parent/pom.xml
+ - Note: this is not needed for referencing parents outside of module
+ - Such as richfaces-parent - it is released already
+
+EOF
+}
+
+work()
+{
+
+if [ "$DEBUG" -eq "1" ]
+then
+ MVNARGS="-X"
+fi
+
+if [ -d "$BASE" ]
+then
+ echo "$ECHO_MARK Beginning build from base directory: $BASE"
+else
+ echo "$ECHO_MARK Base directory does not exist, can not build from: $BASE"
+ exit 1;
+fi
+
+for module_meta in "${MAIN_MODULE_ARRAY[@]}"
+do
+ set -- $module_meta
+ #for each module I need
+ MODULE_PATH=$1
+ REL_VER=$2
+ DEV_VER=$3
+ TAG_BASE=$4
+ VER_PROP_BASE=$5
+
+ #derived variables
+ TAG_NAME="$TAG_BASE-$REL_VER"
+ MODULE_BASE=$BASE/$1
+ MODULE_TRUNK=$MODULE_BASE/$TRUNK_EXT
+ MODULE_TAG=$MODULE_BASE/tags/$TAG_NAME
+ MVN_PREPARE_CMD="mvn $MVNARGS release:prepare --batch-mode -DdevelopmentVersion=$DEV_VER -DreleaseVersion=$REL_VER -Dtag=$TAG_NAME"
+ MVN_PERFORM_CMD="mvn $MVNARGS --batch-mode release:perform"
+ VER_PROP="$VER_PROP_BASE.version"
+
+ echo
+ echo "================================= START"
+ echo "$ECHO_MARK Releasing $VER_PROP_BASE "
+ echo "$ECHO_MARK Module Path : $MODULE_BASE"
+ echo "$ECHO_MARK Module Trunk Path : $MODULE_TRUNK"
+ echo "$ECHO_MARK Module Tag Path : $MODULE_TAG"
+ echo "$ECHO_MARK Development Version : $DEV_VER"
+ echo "$ECHO_MARK Release Version : $REL_VER"
+ echo "$ECHO_MARK Tag Name : $TAG_NAME"
+ echo "$ECHO_MARK Version Prop : $VER_PROP"
+ echo ----------------------------------
+ echo "$ECHO_MARK Moving into $MODULE_TRUNK"
+
+ if [ -d "$MODULE_TRUNK" ]
+ then
+ cd $MODULE_TRUNK
+
+ echo "$ECHO_MARK Excuting Maven Release Prepare Command: $MVN_PREPARE_CMD"
+ $MVN_PREPARE_CMD
+ if [ $? -eq "0" ]
+ then
+ echo "$ECHO_MARK Maven Release Prepare Command Completed"
+ else
+ echo "$ECHO_MARK Maven Release Prepare Command Failed"
+ exit 1;
+ fi
+
+ # NOTE: This might not be needed, because all modules in a project share a version
+ # echo "$ECHO_MARK Fixing maven-release-plugin error with updating import versions in tag: $TAG_NAME"
+ # TODO - Need to verify next dev version gets updated correctly by plugin
+ # find $MODULE_TAG -name "pom.xml" | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/"
+ # svn ci $MODULE_TAG -m "[RichFaces Release Script] Checking in release-plugin fix for import version updates"
+ # echo "$ECHO_MARK Fixing maven-release-plugin error complete"
+
+ echo "$ECHO_MARK Executing Maven Release Perform Command: $MVN_PERFORM_CMD"
+ $MVN_PERFORM_CMD
+ if [ $? -eq "0" ]
+ then
+ echo "$ECHO_MARK Maven Release Perform Command Completed"
+ else
+ echo "$ECHO_MARK Maven Release Perform Command Failed"
+ exit 1;
+ fi
+
+ echo "$ECHO_MARK Updating Intermodule Module Version References"
+ echo "$ECHO_MARK $ECHO_MARK Replacing $VER_PROP properties to: $REL_VER in all modules"
+
+ # Only replace in pom.xml that are in a trunk, not in a tag, or branch
+ # - This is because only modules that have not released yet should be referring to this
+ find $BASE -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/"
+ if [ $? -eq "0" ]
+ then
+ echo "$ECHO_MARK Version References Updated"
+ else
+ echo "$ECHO_MARK Version Reference Update Failed"
+ exit 1;
+ fi
+
+ svn ci $BASE . -m "[RichFaces Release Script] Updated intermodule version of $VER_PROP properties to: $REL_VER"
+ if [ $? -eq "0" ]
+ then
+ echo "$ECHO_MARK Commit of Version References Update Completed"
+ else
+ echo "$ECHO_MARK Commit of Version References Update Failed"
+ exit 1;
+ fi
+
+ # TODO need to handle changing these to next $DEV_VER after release is complete
+ # - Will have to populate an array with data for this.
+
+ echo "================================= END"
+ else
+ # TODO someday create an automatic rollback
+ echo "$ECHO_MARK Module directory does not exist, can not execute release - you must now rollback previous changes"
+ echo =================================
+ exit 1;
+ fi
+
+done
+
+}
+
+BASE=`pwd`
+TRUNK_EXT="trunk"
+ECHO_MARK="==> "
+DEBUG=0
+MVNARGS=
+WORK=1
+
+# Listing of all modules to be released
+# TODO might be read from prop file
+# http://tldp.org/LDP/abs/html/arrays.html#SCRIPTARRAY
+# $1 = path to module trunk/head
+# $2 = release version
+# $3 = dev version
+# $4 = tag name base - "-<release version" appended
+# $5 = version property - required for updating intermodule dependencies modules
+MAIN_MODULE_ARRAY=(
+ "build/bom 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-bom org.richfaces.bom"
+ "commons 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-commons org.richfaces.commons"
+ "core 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-core org.richfaces.core"
+ "cdk 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-cdk org.richfaces.cdk"
+ "ui/core 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-core org.richfaces.ui.core"
+ "ui/misc 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-misc org.richfaces.ui.misc"
+ "ui/iteration 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-iteration org.richfaces.ui.iteration"
+ # TODO Needs to be updated after merge
+ #"ui/dist 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-dist org.richfaces.ui.dist"
+ #"archetypes/richfaces-archetype-simpleapp/ 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-archetype-simpleapp org.richfaces.archetypes.richfaces-archetype-simpleapp"
+ #"archetypes/richfaces-archetype-simpleapp/ 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-archetype-simpleapp org.richfaces.archetypes richfaces-archetype-simpleapp"
+ )
+
+while getopts "hb:x" OPTION
+do
+ case $OPTION in
+ h)
+ usage
+ WORK=0
+ ;;
+ b)
+ BASE=$OPTARG
+ ;;
+ x)
+ DEBUG=1
+ ;;
+ [?])
+ usage;
+ WORK=0
+ ;;
+ esac
+done
+
+if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
+then
+ work;
+fi
\ No newline at end of file
Modified: root/cdk/trunk/archetypes/ui-multimodule/pom.xml
===================================================================
--- root/cdk/trunk/archetypes/ui-multimodule/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/archetypes/ui-multimodule/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -7,6 +7,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetypes</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/trunk/archetypes/ui-singlemodule/pom.xml
===================================================================
--- root/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -7,6 +7,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetypes</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/cdk/trunk/bom/pom.xml
===================================================================
--- root/cdk/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -19,7 +19,7 @@
<name>JSF Components Development Kit (CDK) bill of materials.</name>
<description>This module defines all versions of CDK projects and their dependencies.</description>
<properties>
- <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
+ <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version>
</properties>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/bom</connection>
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-bom</artifactId>
- <version>${richfaces.commons.version}</version>
+ <version>${org.richfaces.commons.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: root/cdk/trunk/parent/pom.xml
===================================================================
--- root/cdk/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -25,9 +25,9 @@
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/root</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/root</developerConnection>
- <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/root</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/trunk/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/cdk/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/parent</url>
</scm>
<repositories>
<repository>
Modified: root/cdk/trunk/plugins/commons/pom.xml
===================================================================
--- root/cdk/trunk/plugins/commons/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/plugins/commons/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -7,6 +7,7 @@
<artifactId>maven-plugins</artifactId>
<groupId>org.richfaces.cdk</groupId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>commons</artifactId>
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -4,6 +4,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
Modified: root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml
===================================================================
--- root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -5,6 +5,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-javascript-plugin</artifactId>
Modified: root/cdk/trunk/pom.xml
===================================================================
--- root/cdk/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/cdk/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -19,7 +19,7 @@
<module>parent</module>
<module>plugins</module>
<module>archetypes</module>
- <module>docs</module>
+ <!-- <module>docs</module> -->
<module>dist</module>
</modules>
<!-- SCM and distribution management -->
Modified: root/commons/trunk/api/pom.xml
===================================================================
--- root/commons/trunk/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/commons/trunk/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,6 +24,7 @@
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.commons</groupId>
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/commons/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -40,7 +40,7 @@
<url>http://www.jboss.org/richfaces</url>
<properties>
- <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version>
+ <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version>
</properties>
<!-- Runtime dependency management -->
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-bom</artifactId>
- <version>${richfaces.bom.version}</version>
+ <version>${org.richfaces.bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/commons/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -36,7 +36,6 @@
</description>
<properties>
- <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
</properties>
@@ -45,7 +44,7 @@
<dependency>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-bom</artifactId>
- <version>${richfaces.commons.version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: root/core/trunk/api/pom.xml
===================================================================
--- root/core/trunk/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/core/trunk/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -25,6 +25,7 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/core/trunk/bom/pom.xml
===================================================================
--- root/core/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/core/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -39,8 +39,7 @@
<url>http://www.jboss.org/richfaces</url>
<properties>
- <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
- <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version>
+ <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version>
</properties>
<!-- Runtime dependency management -->
@@ -49,7 +48,7 @@
<dependency>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-bom</artifactId>
- <version>${richfaces.commons.version}</version>
+ <version>${org.richfaces.commons.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: root/core/trunk/impl/pom.xml
===================================================================
--- root/core/trunk/impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/core/trunk/impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -25,6 +25,7 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/core/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -38,7 +38,6 @@
</description>
<properties>
- <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
</properties>
@@ -47,7 +46,7 @@
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-bom</artifactId>
- <version>${richfaces.core.version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: root/ui/core/trunk/bom/pom.xml
===================================================================
--- root/ui/core/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/core/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,14 +30,14 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Core BOM</name>
<packaging>pom</packaging>
<properties>
- <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version>
+ <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
</properties>
<dependencyManagement>
@@ -45,16 +45,22 @@
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-bom</artifactId>
- <version>${richfaces.core.api.version}</version>
+ <version>${org.richfaces.core.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/core/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,7 +30,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Core Parent</name>
@@ -38,12 +38,13 @@
<properties>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -53,7 +54,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -65,7 +66,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -176,4 +177,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/core/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,7 +30,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -41,4 +41,10 @@
<module>parent</module>
<module>ui</module>
</modules>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/core/trunk/ui/pom.xml
===================================================================
--- root/ui/core/trunk/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/core/trunk/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -21,13 +21,14 @@
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>
+ <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</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
<name>Richfaces UI Components: Core UI</name>
<packaging>jar</packaging>
@@ -111,4 +112,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/core/trunk/ui</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/core/trunk/ui</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/dist/trunk/assembler.xml
===================================================================
--- root/ui/dist/trunk/assembler.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/dist/trunk/assembler.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -7,8 +7,7 @@
<moduleSet>
<includeSubModules>true</includeSubModules>
<includes>
- <include>org.richfaces.ui:*</include>
- <include>org.richfaces.ui-sandbox:*</include>
+ <include>org.richfaces.ui.*:*</include>
</includes>
<sources>
Modified: root/ui/dist/trunk/pom.xml
===================================================================
--- root/ui/dist/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/dist/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -29,7 +29,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-ui-assembler</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -44,8 +44,32 @@
</modules>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--
+ The dist requires clean install for prepare
+ -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--
+ The dist requires clean install for prepare
+ -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -65,5 +89,11 @@
</modules>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.dist</groupId>
+ <artifactId>richfaces-ui-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-components-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -41,9 +42,10 @@
</properties>
<dependencyManagement>
+ <!-- TODO these must be updated to follow release script property naming -->
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -54,7 +56,7 @@
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-api</artifactId>
</dependency>
@@ -121,7 +123,7 @@
<configuration>
<artifactSet>
<includes>
- <include>${assembly.projects.group}:*-api:*</include>
+ <include>${assembly.projects.group}.*:*-api:*</include>
</includes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>
@@ -157,7 +159,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
@@ -184,4 +186,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.dist</groupId>
+ <artifactId>richfaces-ui-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-components-impl</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -42,8 +43,9 @@
<dependencyManagement>
<dependencies>
+ <!-- TODO these must be updated to follow release script property naming -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -54,13 +56,12 @@
<dependencies>
<dependency>
- <groupId>${assembly.projects.group}</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-impl</artifactId>
</dependency>
-
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-components-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -157,7 +158,7 @@
<configuration>
<artifactSet>
<includes>
- <include>org.richfaces.ui:*-impl:*</include>
+ <include>org.richfaces.ui.*:*-impl:*</include>
</includes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>
@@ -193,7 +194,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
@@ -220,4 +221,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.dist</groupId>
+ <artifactId>richfaces-ui-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-components-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -42,22 +43,23 @@
<dependencyManagement>
<dependencies>
+ <!-- TODO these must be updated to follow release script property naming -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -69,21 +71,21 @@
<dependencies>
<!-- artifacts for aggregation -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-ui</artifactId>
</dependency>
<!-- for javadoc generation -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.dist</groupId>
<artifactId>richfaces-components-impl</artifactId>
<version>${project.version}</version>
</dependency>
@@ -135,13 +137,6 @@
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -159,7 +154,7 @@
<configuration>
<artifactSet>
<includes>
- <include>org.richfaces.ui:*-ui:*</include>
+ <include>${assembly.projects.group}.*:*-ui:*</include>
</includes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>
@@ -210,7 +205,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>${assembly.projects.group}</includeGroupIds>
+ <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
@@ -275,5 +270,11 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/richf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/richface...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/bom/pom.xml
===================================================================
--- root/ui/iteration/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,14 +30,14 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Iteration BOM</name>
<packaging>pom</packaging>
<properties>
- <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
+ <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
</properties>
<dependencyManagement>
@@ -45,23 +45,23 @@
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-bom</artifactId>
- <version>${richfaces.core.version}</version>
+ <version>${org.richfaces.core.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-ui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -96,4 +96,10 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
Modified: root/ui/iteration/trunk/datascroller/api/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/datascroller/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,9 +24,10 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>datascroller-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -96,5 +97,11 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/datascroller/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/datascroller/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
@@ -40,4 +41,10 @@
<module>api</module>
<module>ui</module>
</modules>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/datascroller/ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>datascroller-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
@@ -119,5 +120,11 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dat...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/dist/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-assembler</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -41,4 +42,21 @@
<module>richfaces-ui-iteration-impl</module>
<module>richfaces-ui-iteration-ui</module>
</modules>
+
+ <build>
+ <plugins>
+ <!-- We need to disable the cdk plugin for the dist modules -->
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dist</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -43,7 +44,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -156,4 +157,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-impl</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -43,7 +44,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -158,4 +159,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -43,7 +44,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -210,4 +211,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/dis...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/parent/pom.xml
===================================================================
--- root/ui/iteration/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,7 +30,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Iteration Parent</name>
@@ -38,12 +38,13 @@
<properties>
<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -53,7 +54,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -65,7 +66,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -176,4 +177,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
Modified: root/ui/iteration/trunk/pom.xml
===================================================================
--- root/ui/iteration/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,7 +30,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -41,7 +41,41 @@
<module>parent</module>
<module>tables</module>
<module>datascroller</module>
-
<module>dist</module>
</modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--
+ The dist requires clean install for prepare
+ -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--
+ The dist requires clean install for prepare
+ -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/api/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/tables/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,9 +24,10 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>tables-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -102,5 +103,11 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/impl/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/tables/impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>tables-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
@@ -119,5 +120,11 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/tables/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
@@ -41,4 +42,10 @@
<module>impl</module>
<module>ui</module>
</modules>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tables</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/iteration/trunk/tables/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -26,9 +26,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-parent</artifactId>
+ <groupId>org.richfaces.ui.iteration</groupId>
+ <artifactId>tables-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
@@ -119,5 +120,11 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/iteration/trunk/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/iteration/trunk/tab...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/bom/pom.xml
===================================================================
--- root/ui/misc/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,14 +30,14 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Miscellanous BOM</name>
<packaging>pom</packaging>
<properties>
- <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version>
+ <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
</properties>
<dependencyManagement>
@@ -45,16 +45,32 @@
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-bom</artifactId>
- <version>${richfaces.core.api.version}</version>
+ <version>${org.richfaces.core.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>componentcontrol-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>functions-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
Modified: root/ui/misc/trunk/componentcontrol/pom.xml
===================================================================
--- root/ui/misc/trunk/componentcontrol/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/componentcontrol/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -21,9 +21,10 @@
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>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -46,7 +47,7 @@
<dependency>
<!-- todo remove this dependency -->
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
@@ -116,4 +117,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/compo...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/componen...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/dist/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/dist/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>richfaces-ui-misc-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-assembler</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -39,4 +40,21 @@
<!-- aggregate modules -->
<module>richfaces-ui-misc-ui</module>
</modules>
+
+ <build>
+ <plugins>
+ <!-- We need to disable the cdk plugin for the dist modules -->
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <inherited>false</inherited>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -24,12 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
+ <groupId>org.richfaces.ui.misc</groupId>
+ <artifactId>richfaces-ui-misc-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -38,31 +39,18 @@
<properties>
<assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group>
<faces-shade-transformers.version>1</faces-shade-transformers.version>
+ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- artifacts for aggregation -->
<dependency>
- <groupId>${assembly.projects.group}</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>componentcontrol-ui</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${assembly.projects.group}</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>functions-ui</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- artifacts for javadoc generation -->
@@ -73,8 +61,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <version>${org.richfaces.cdk.version}</version>
</dependency>
</dependencies>
@@ -214,4 +201,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/dist/ric...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/functions/pom.xml
===================================================================
--- root/ui/misc/trunk/functions/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/functions/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -21,9 +21,10 @@
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>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -110,4 +111,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/funct...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/functions</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
\ No newline at end of file
Modified: root/ui/misc/trunk/parent/pom.xml
===================================================================
--- root/ui/misc/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,30 +30,31 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Miscellanous Parent</name>
<packaging>pom</packaging>
- <properties>
- <richfaces.core.ui.version>4.0.0-SNAPSHOT</richfaces.core.ui.version>
- </properties>
-
+ <properties>
+ <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>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- TODO: remove this dependency used by componentControl -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-bom</artifactId>
- <version>${richfaces.core.ui.version}</version>
+ <version>${org.richfaces.ui.core.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
@@ -63,19 +64,19 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
-
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${org.richfaces.cdk.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -121,4 +122,9 @@
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
</project>
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
+++ root/ui/misc/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472)
@@ -30,7 +30,7 @@
<version>7</version>
</parent>
- <groupId>org.richfaces.ui</groupId>
+ <groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -47,6 +47,20 @@
</modules>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--
+ The dist requires clean install for prepare
+ -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.richfaces.cdk</groupId>
@@ -65,7 +79,21 @@
<fail>false</fail>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The dist requires clean install for prepare -->
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/misc/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/misc/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/</url>
+ </scm>
+
</project>
\ No newline at end of file
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17471 - root/examples/richfaces-showcase/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 14:46:37 -0400 (Wed, 02 Jun 2010)
New Revision: 17471
Modified:
root/examples/richfaces-showcase/trunk/pom.xml
Log:
Missing JSTL dependency added
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 18:41:18 UTC (rev 17470)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471)
@@ -66,6 +66,10 @@
<artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -160,8 +164,8 @@
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes>
- <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes>
</configuration>
</execution>
</executions>
@@ -234,6 +238,11 @@
<version>1.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17470 - in root: examples/richfaces-showcase/trunk and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-06-02 14:41:18 -0400 (Wed, 02 Jun 2010)
New Revision: 17470
Modified:
root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml
root/examples/richfaces-showcase/trunk/pom.xml
Log:
correct archetype and showcase
Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-02 17:43:42 UTC (rev 17469)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-02 18:41:18 UTC (rev 17470)
@@ -38,8 +38,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
@@ -58,6 +58,38 @@
<profiles>
<profile>
+ <id>jee6</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>release</id>
<build>
<plugins>
@@ -95,8 +127,8 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-bom</artifactId>
<version>4.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
@@ -108,7 +140,6 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -120,16 +151,50 @@
<artifactId>jsf-impl</artifactId>
</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>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
</dependency>
+
+ <!-- Log4J dependency used in examples -->
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <!-- Tests -->
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.10</version>
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 17:43:42 UTC (rev 17469)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 18:41:18 UTC (rev 17470)
@@ -35,20 +35,6 @@
<scope>import</scope>
<type>pom</type>
</dependency>
-
- <!-- simple logger binding: only messages of level INFO and higher are printed-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -85,13 +71,19 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
</dependency>
+
+ <!-- Log4J dependency used in examples -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>1.2.14</version>
</dependency>
</dependencies>
@@ -106,10 +98,8 @@
<dependencies>
<dependency>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-build-checkstyle
- </artifactId>
- <version>${richfaces.checkstyle.version}
- </version>
+ <artifactId>richfaces-build-checkstyle</artifactId>
+ <version>${richfaces.checkstyle.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -141,19 +131,19 @@
</build>
<profiles>
- <profile>
- <id>jdk5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2</version>
</dependency>
- </dependencies>
- </profile>
+ </dependencies>
+ </profile>
<profile>
<id>release</id>
<build>
@@ -212,8 +202,6 @@
</executions>
</plugin>
</plugins>
-
-
</build>
</profile>
<profile>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17469 - root/dist/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 13:43:42 -0400 (Wed, 02 Jun 2010)
New Revision: 17469
Modified:
root/dist/trunk/pom.xml
root/dist/trunk/richfaces.xml
Log:
https://jira.jboss.org/browse/RF-8710
Modified: root/dist/trunk/pom.xml
===================================================================
--- root/dist/trunk/pom.xml 2010-06-02 16:50:09 UTC (rev 17468)
+++ root/dist/trunk/pom.xml 2010-06-02 17:43:42 UTC (rev 17469)
@@ -177,6 +177,7 @@
<includeGroupIds>org.richfaces.archetypes</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<stripVersion>true</stripVersion>
+ <classifier>sources</classifier>
</configuration>
</execution>
</executions>
Modified: root/dist/trunk/richfaces.xml
===================================================================
--- root/dist/trunk/richfaces.xml 2010-06-02 16:50:09 UTC (rev 17468)
+++ root/dist/trunk/richfaces.xml 2010-06-02 17:43:42 UTC (rev 17469)
@@ -116,7 +116,7 @@
<!-- Archetypes -->
<fileSet>
- <directory>target/dependency/richfaces-archetype-simpleapp-jar/archetype-resources</directory>
+ <directory>target/dependency/richfaces-archetype-simpleapp-sources-java-source</directory>
<outputDirectory>archetypes/richfaces-archetype-simpleapp/</outputDirectory>
</fileSet>
</fileSets>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17468 - root/archetypes/richfaces-archetype-simpleapp/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 12:50:09 -0400 (Wed, 02 Jun 2010)
New Revision: 17468
Added:
root/archetypes/richfaces-archetype-simpleapp/trunk/assembler.xml
Modified:
root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
Log:
https://jira.jboss.org/browse/RF-8710
Added: root/archetypes/richfaces-archetype-simpleapp/trunk/assembler.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/assembler.xml (rev 0)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/assembler.xml 2010-06-02 16:50:09 UTC (rev 17468)
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <files>
+ <file>
+ <source>pom.xml</source>
+ </file>
+ <file>
+ <source>readme.txt</source>
+ </file>
+ </files>
+
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-06-02 16:37:12 UTC (rev 17467)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-06-02 16:50:09 UTC (rev 17468)
@@ -1,39 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>7</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.archetypes</groupId>
- <artifactId>richfaces-archetype-simpleapp</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
- <name>RichFaces Archetypes: Simple Application</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
+ </parent>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.archetypes</groupId>
+ <artifactId>richfaces-archetype-simpleapp</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+ <name>RichFaces Archetypes: Simple Application</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>group-sources</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <finalName>sources</finalName>
+ <descriptor>assembler.xml</descriptor>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <classesDirectory>${basedir}/target/sources/sources</classesDirectory>
+ <classifier>sources</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17467 - root/archetypes/richfaces-archetype-simpleapp/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 12:37:12 -0400 (Wed, 02 Jun 2010)
New Revision: 17467
Modified:
root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
Log:
Added richfaces-parent to richfaces-archetype-simpleapp
Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml
===================================================================
--- root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-06-02 15:44:40 UTC (rev 17466)
+++ root/archetypes/richfaces-archetype-simpleapp/trunk/pom.xml 2010-06-02 16:37:12 UTC (rev 17467)
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.archetypes</groupId>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17466 - in root/examples/richfaces-showcase/trunk: src/main/webapp/richfaces/componentControl and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 11:44:40 -0400 (Wed, 02 Jun 2010)
New Revision: 17466
Modified:
root/examples/richfaces-showcase/trunk/pom.xml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml
Log:
richfaces-showcase switched to richfaces-components-bom
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -30,20 +30,12 @@
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-bom</artifactId>
+ <artifactId>richfaces-components-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<!-- simple logger binding: only messages of level INFO and higher are printed-->
<dependency>
<groupId>org.slf4j</groupId>
@@ -63,32 +55,9 @@
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-ui</artifactId>
+ <artifactId>richfaces-components-ui</artifactId>
</dependency>
-
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </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>
- <artifactId>jaxb-api</artifactId>
- <version>2.2</version>
- </dependency>
-
- <dependency>
<groupId>${jsf2.api.groupid}</groupId>
<artifactId>${jsf2.api.artifactid}</artifactId>
</dependency>
@@ -172,6 +141,19 @@
</build>
<profiles>
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>release</id>
<build>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,10 +4,9 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
+ xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
- xmlns:rfn="http://richfaces.org/misc">
+ xmlns:r="http://java.sun.com/jsf/composite/rich">
<ui:composition>
<style>
@@ -19,7 +18,7 @@
<p>Currently target component should be defined by using clientId, but we planning to add lookup by short id in nearest versions.</p>
<h:form id="form">
<h:panelGrid columns="2" columnClasses="atop">
- <rich:panel>
+ <r:panel>
<f:facet name="header">
<h:outputText value="Quick Filter Panel" />
</f:facet>
@@ -27,19 +26,19 @@
<ul>
<a4j:repeat value="#{carsBean.allVendors}" var="vendor">
<li><h:outputLink value="#">#{vendor}
- <rfn:componentControl target="table" operation="filter" event="click">
+ <rich:componentControl target="table" operation="filter" event="click">
<f:param value="vendor"/>
<f:param value="#{vendor}"/>
- </rfn:componentControl>
+ </rich:componentControl>
</h:outputLink>
</li>
</a4j:repeat>
</ul>
</fieldset>
- </rich:panel>
- <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ </r:panel>
+ <rich:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20">
- <it:column id="vendor" filterValue="#{carsFilteringBean.vendorFilter}"
+ <rich:column id="vendor" filterValue="#{carsFilteringBean.vendorFilter}"
filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}">
<f:facet name="header">
<h:panelGroup>
@@ -47,47 +46,47 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Days Live" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.daysLive}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="VIN " />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </it:column>
+ </rich:column>
<f:facet name="footer">
- <it:dataScroller/>
+ <rich:dataScroller/>
</f:facet>
- </it:dataTable>
+ </rich:dataTable>
</h:panelGrid>
</h:form>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
- xmlns:fn="http://richfaces.org/misc">
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<style>
@@ -26,15 +25,15 @@
<h:panelGrid columns="1" rowClasses="calign">
<h:panelGrid columns="3" id="repeat">
<h:graphicImage value="/images/icons/scroller/arr_left.png"
- onclick="#{fn:component('ds')}.previous()" />
+ onclick="#{rich:component('ds')}.previous()" />
<a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic"
id="pics">
<h:graphicImage value="#{pic.uri}" style="padding:5px;"/>
</a4j:repeat>
<h:graphicImage value="/images/icons/scroller/arr_right.png"
- onclick="#{fn:component('ds')}.next()" />
+ onclick="#{rich:component('ds')}.next()" />
</h:panelGrid>
- <it:dataScroller for="pics" id="ds" render="repeat" stepControls="none" boundaryControls="none" fastControls="none" maxPages="10"/>
+ <rich:dataScroller for="pics" id="ds" render="repeat" stepControls="none" boundaryControls="none" fastControls="none" maxPages="10"/>
</h:panelGrid>
</h:form>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
+ xmlns:rich="http://richfaces.org/rich"
>
<ui:composition>
@@ -12,41 +12,41 @@
<p>Starting from 4.x version - no more additional updated should be defined by end-developer in order to
synchronize different dataScrollers attached to the same table as in example below.</p>
<h:form id="form">
- <it:dataScroller for="table" maxPages="6"/>
- <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <rich:dataScroller for="table" maxPages="6"/>
+ <rich:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="10">
- <it:column accept="#{carsFiteringBean.acceptVendor}">
+ <rich:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:outputText value="Vendor " />
</f:facet>
<h:outputText value="#{car.vendor}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Mileage" />
</f:facet>
<h:outputText value="#{car.mileage}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="VIN " />
</f:facet>
<h:outputText value="#{car.vin}" />
- </it:column>
- </it:dataTable>
- <it:dataScroller for="table" maxPages="6"/>
+ </rich:column>
+ </rich:dataTable>
+ <rich:dataScroller for="table" maxPages="6"/>
</h:form>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,47 +4,47 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration">
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b>
tbl:dataTable</b> and<b> tbl:subtable</b> components</p>
- <it:dataTable width="700" var="record"
+ <rich:dataTable width="700" var="record"
value="#{reportBean.expReport.records}">
<f:facet name="header">
- <it:columnGroup>
- <it:column rowspan="2">
- </it:column>
- <it:column colspan="3">
+ <rich:columnGroup>
+ <rich:column rowspan="2">
+ </rich:column>
+ <rich:column colspan="3">
<h:outputText value="Expenses" />
- </it:column>
- <it:column rowspan="2">
+ </rich:column>
+ <rich:column rowspan="2">
<h:outputText value="subtotals" />
- </it:column>
- <it:column breakRowBefore="true">
+ </rich:column>
+ <rich:column breakRowBefore="true">
<h:outputText value="Meals" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Hotels" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Transport" />
- </it:column>
- </it:columnGroup>
+ </rich:column>
+ </rich:columnGroup>
</f:facet>
- <it:column colspan="5">
+ <rich:column colspan="5">
<h:outputText value="#{record.city}" />
- </it:column>
+ </rich:column>
- <it:subTable var="expense" value="#{record.items}">
- <it:column>
+ <rich:subTable var="expense" value="#{record.items}">
+ <rich:column>
<h:outputText value="#{expense.day}"></h:outputText>
<f:facet name="footer">
<div></div>
</f:facet>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{expense.meals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -53,8 +53,8 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{expense.hotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -63,9 +63,9 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </it:column>
+ </rich:column>
- <it:column>
+ <rich:column>
<h:outputText value="#{expense.transport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -74,46 +74,46 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="footer">
<h:outputText value="#{record.total}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </it:column>
+ </rich:column>
- </it:subTable>
+ </rich:subTable>
<f:facet name="footer">
- <it:columnGroup>
- <it:column>Totals</it:column>
- <it:column>
+ <rich:columnGroup>
+ <rich:column>Totals</rich:column>
+ <rich:column>
<h:outputText value="#{reportBean.expReport.totalMeals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{reportBean.expReport.totalHotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{reportBean.expReport.totalTransport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{reportBean.expReport.grandTotal}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </it:column>
- </it:columnGroup>
+ </rich:column>
+ </rich:columnGroup>
</f:facet>
- </it:dataTable>
+ </rich:dataTable>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,19 +4,19 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
+ xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:r="http://java.sun.com/jsf/composite/rich">
<ui:composition>
<h:form id="form">
- <rich:messages/>
- <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <r:messages/>
+ <rich:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="30">
<f:facet name="noData">
Nothing found
</f:facet>
- <it:column filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}">
+ <rich:column filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Vendor " />
@@ -27,20 +27,20 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </it:column>
- <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </rich:column>
+ <rich:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage < " />
@@ -52,8 +52,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </it:column>
- <it:column filterValue="#{carsFilteringBean.vinFilter}"
+ </rich:column>
+ <rich:column filterValue="#{carsFilteringBean.vinFilter}"
filterExpression="#{fn:containsIgnoreCase(car.vin,carsFilteringBean.vinFilter)}">
<f:facet name="header">
<h:panelGroup>
@@ -64,8 +64,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </it:column>
- </it:dataTable>
+ </rich:column>
+ </rich:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
- xmlns:fn="http://richfaces.org/misc">
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<p>
@@ -15,36 +14,36 @@
<p>Currently you could only control sortOrder in your actions, and in near versions we're planning to add special sort controls</p>
<p>Also you could use # {rich:component('tableId')}.sort('columnId', ['sortOrder']) JS api</p>
<h:form>
- <it:dataTable value="#{capitalsBean.capitals}" var="cap" id="table">
- <it:column>
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table">
+ <rich:column>
<f:facet name="header">
State Flag
</f:facet>
<h:graphicImage value="#{cap.stateFlag}" />
- </it:column>
- <it:column sortBy="#{cap.name}" id="name"
+ </rich:column>
+ <rich:column sortBy="#{cap.name}" id="name"
sortOrder="#{capitalsSortingBean.capitalsOrder}">
<f:facet name="header">
<a4j:commandLink value="Sort by Capital Name" render="table" action="#{capitalsSortingBean.sortByCapitals}"/>
</f:facet>
<h:outputText value="#{cap.name}" />
- </it:column>
- <it:column sortBy="#{cap.state}" id="state"
+ </rich:column>
+ <rich:column sortBy="#{cap.state}" id="state"
sortOrder="#{capitalsSortingBean.statesOrder}">
<f:facet name="header">
<a4j:commandLink value="Sort by State Name" render="table" action="#{capitalsSortingBean.sortByStates}"/>
</f:facet>
<h:outputText value="#{cap.state}" />
- </it:column>
- <it:column sortBy="#{cap.timeZone}" id="timeZone"
+ </rich:column>
+ <rich:column sortBy="#{cap.timeZone}" id="timeZone"
comparator="#{capitalsSortingBean.timeZoneComparator}"
sortOrder="#{capitalsSortingBean.timeZonesOrder}">
<f:facet name="header">
<a4j:commandLink value="Sort by Time Zone" render="table" action="#{capitalsSortingBean.sortByTimeZones}"/>
</f:facet>
<h:outputText value="#{cap.timeZone}" />
- </it:column>
- </it:dataTable>
+ </rich:column>
+ </rich:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration"
+ xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<ui:composition>
@@ -25,40 +25,40 @@
<p>This sample shows simple table styling. The table appears in
zebra-style and has highlighting of hovered row.</p>
<h:form id="form">
- <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <rich:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20" rowClasses="odd-row, even-row"
styleClass="stable">
- <it:column accept="#{carsFiteringBean.acceptVendor}">
+ <rich:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:outputText value="Vendor " />
</f:facet>
<h:outputText value="#{car.vendor}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </it:column>
- <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </rich:column>
+ <rich:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:outputText value="Mileage" />
</f:facet>
<h:outputText value="#{car.mileage}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="VIN " />
</f:facet>
<h:outputText value="#{car.vin}" />
- </it:column>
- </it:dataTable>
+ </rich:column>
+ </rich:dataTable>
</h:form>
<script>
$('.stable tr').mouseover(function(){$(this).addClass('active-row')});
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration">
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<p>ExtendedDataTable component provides next set of features:</p>
@@ -15,54 +15,54 @@
</ul>
<h:form>
- <it:extendedDataTable value="#{carsBean.allInventoryItems}" var="car"
+ <rich:extendedDataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" frozenColumns="2" style="height:300px; width:500px;">
<f:facet name="header">
<h:outputText value="Cars marketplace" />
</f:facet>
- <it:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="vendor" />
</f:facet>
<h:outputText value="#{car.vendor}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Mileage" />
</f:facet>
<h:outputText value="#{car.mileage}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="VIN Code" />
</f:facet>
<h:outputText value="#{car.vin}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Items stock" />
</f:facet>
<h:outputText value="#{car.stock}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<f:facet name="header">
<h:outputText value="Days Live" />
</f:facet>
<h:outputText value="#{car.daysLive}" />
- </it:column>
- </it:extendedDataTable>
+ </rich:column>
+ </rich:extendedDataTable>
</h:form>
<p>In order to turn on Ajax loading - just specify clientRows attribute with number of rows
to be loaded on the client</p>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/functions/functions.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
- xmlns:fn="http://richfaces.org/misc">
+ xmlns:rich="http://richfaces.org/rich">
<p>
RichFaces provides set of functions for more convinient work with DOM tree and
to use some server side expressions.
@@ -14,21 +13,21 @@
Here is the current list:
</p>
<ul>
- <li><b>fn:clientId(id)</b> - returns client Id for component by it's short id.</li>
- <li><b>fn:element(id)</b> - returns DOM element for the passed short id</li>
- <li><b>fn:component(id)</b> - returns richfaces client component instance to call some API method.</li>
- <li><b>fn:isUserInRole(role)</b> - returns is the user has specified role.</li>
- <li><b>fn:findComponent(id)</b> - returns component instance for given short id</li>
+ <li><b>rich:clientId(id)</b> - returns client Id for component by it's short id.</li>
+ <li><b>rich:element(id)</b> - returns DOM element for the passed short id</li>
+ <li><b>rich:component(id)</b> - returns richfaces client component instance to call some API method.</li>
+ <li><b>rich:isUserInRole(role)</b> - returns is the user has specified role.</li>
+ <li><b>rich:findComponent(id)</b> - returns component instance for given short id</li>
</ul>
-<p>For example the result of #{fn:element('input')} expression will be - document.getElementById('formId:input').</p>
+<p>For example the result of #{rich:element('input')} expression will be - document.getElementById('formId:input').</p>
<p>And here is one more simple example. There is no need in Bean creation in order to store the value. It's picked from component instance by using rich:findComponent call.</p>
<h:form>
<h:inputText id="input">
<a4j:ajax render="out"/>
</h:inputText>
- <h:outputText value="#{fn:findComponent('input').value}" id="out"/>
+ <h:outputText value="#{rich:findComponent('input').value}" id="out"/>
</h:form>
- <p>One more sample could be found at dataScroller API page. There are fn:component used for calling JS API of dataScroller.</p>
+ <p>One more sample could be found at dataScroller API page. There are rich:component used for calling JS API of dataScroller.</p>
<p>This set goes to be extended continously. Rise jira or forum requests if you have
proposals on new useful functions.</p>
</ui:composition>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/queue/queue.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -3,9 +3,9 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rfn="http://richfaces.org/misc"
+ xmlns:rich="http://richfaces.org/rich"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:r="http://java.sun.com/jsf/composite/rich">
<p>JSF 2 provides queue mechanism out-of the box already. And RichFaces queue just provides
some additional customizations to improve the queue usability and allow to tune your
performance while using Ajax as much as possible.</p>
@@ -23,7 +23,7 @@
<li>Setting request delay to greater value reduces the greatly requests count on fast typing. (More similar requests are combined in the result)</li>
</ul>
Also pay your attention to the queue definition. Such definition (inside some form without a name) means that the queue options becomes global for the form.
- <rich:panel>
+ <r:panel>
<h:form id="form">
<a4j:queue requestDelay="#{queueBean.requestDelay}"/>
<h:panelGrid columns="1" width="100%">
@@ -44,7 +44,7 @@
<h:outputText value="DOM updates count:" />
<h:outputText value="0" id="updates" />
</h:panelGrid>
- <rich:message for="form:delay" style="color:red;" />
+ <r:message for="form:delay" style="color:red;" />
<h:panelGrid columns="2">
<h:outputText value="Request delay:" />
<h:inputText value="#{queueBean.requestDelay}" id="delay"
@@ -57,13 +57,13 @@
</h:panelGrid>
</h:panelGrid>
</h:form>
- </rich:panel>
+ </r:panel>
<script type="text/javascript">
var events = 0;
var updates = 0;
- var outEvents = #{rfn:element('events')};
- var outUpdates = #{rfn:element('updates')};
- var outRequests = #{rfn:element('requests')};
+ var outEvents = #{rich:element('events')};
+ var outUpdates = #{rich:element('updates')};
+ var outRequests = #{rich:element('requests')};
var requests=0;
function addEvent(){
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,8 +4,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
- xmlns:it="http://richfaces.org/iteration">
+ xmlns:r="http://java.sun.com/jsf/composite/rich"
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<p>a4j:repeat is a base iteration component of RichFaces. It allows
@@ -15,7 +15,7 @@
<a4j:outputPanel id="panel" layout="block">
<a4j:repeat value="#{capitalsBean.capitals}" var="cap" rows="20"
id="repeat">
- <rich:panel style="float:left; width:200px; padding:5px;">
+ <r:panel style="float:left; width:200px; padding:5px;">
<f:facet name="header">
<h:panelGroup>
<h:graphicImage value="#{cap.stateFlag}" />
@@ -28,11 +28,11 @@
<h:outputText value="State TimeZone" style="font-weight:bold" />
<h:outputText value="#{cap.timeZone}" />
</h:panelGrid>
- </rich:panel>
+ </r:panel>
</a4j:repeat>
</a4j:outputPanel>
<a4j:outputPanel layout="block">
- <it:dataScroller for="repeat" render="panel" />
+ <rich:dataScroller for="repeat" render="panel" />
</a4j:outputPanel>
</h:form>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-06-02 15:40:05 UTC (rev 17465)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-06-02 15:44:40 UTC (rev 17466)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:it="http://richfaces.org/iteration">
+ xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b> rich:dataTable</b> and<b> rich:subtable</b> components</p>
@@ -17,60 +17,60 @@
<li>The developer could get control on current states of subTables using its <b>expanded</b> attribute.</li>
</ul>
<h:form>
- <it:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
+ <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
<f:facet name="header">
- <it:columnGroup>
- <it:column colspan="6">
+ <rich:columnGroup>
+ <rich:column colspan="6">
<h:outputText value="Cars marketplace" />
- </it:column>
- <it:column breakRowBefore="true">
+ </rich:column>
+ <rich:column breakRowBefore="true">
<h:outputText value="Model" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Price" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Mileage" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="VIN Code" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Items stock" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="Days Live" />
- </it:column>
- </it:columnGroup>
+ </rich:column>
+ </rich:columnGroup>
</f:facet>
- <it:column colspan="6">
- <it:subTableToggleControl for="sbtbl"/>
+ <rich:column colspan="6">
+ <rich:subTableToggleControl for="sbtbl"/>
<h:outputText value="#{list.vendor}" />
- </it:column>
- <it:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client">
- <it:column>
+ </rich:column>
+ <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client">
+ <rich:column>
<h:outputText value="#{item.model}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{item.price}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{item.mileage}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{item.vin}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{item.stock}" />
- </it:column>
- <it:column>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{item.daysLive}" />
- </it:column>
+ </rich:column>
<f:facet name="footer">
<h:outputText value="Total of #{list.vendor} Cars: #{list.count}" />
</f:facet>
- </it:subTable>
- </it:dataTable>
+ </rich:subTable>
+ </rich:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17465 - in root/ui/dist/trunk: bom and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 11:40:05 -0400 (Wed, 02 Jun 2010)
New Revision: 17465
Added:
root/ui/dist/trunk/bom/
root/ui/dist/trunk/bom/pom.xml
Modified:
root/ui/dist/trunk/pom.xml
Log:
Added BoM for richfaces-ui-* artifacts
Added: root/ui/dist/trunk/bom/pom.xml
===================================================================
--- root/ui/dist/trunk/bom/pom.xml (rev 0)
+++ root/ui/dist/trunk/bom/pom.xml 2010-06-02 15:40:05 UTC (rev 17465)
@@ -0,0 +1,90 @@
+ <!--
+ 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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-components-bom</artifactId>
+ <packaging>pom</packaging>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>RichFaces UI BOM</name>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <description>
+ The RichFaces UI "Bill of Materials". This defines components specific runtime dependency versions.
+ </description>
+
+ <url>http://www.jboss.org/richfaces</url>
+
+ <properties>
+ <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
+ <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
+ <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version>
+ </properties>
+
+ <!-- Runtime dependency management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>richfaces-commons-bom</artifactId>
+ <version>${richfaces.commons.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-bom</artifactId>
+ <version>${richfaces.core.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <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>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/dist/trunk/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/ui/dist/trunk/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/richfaces/root/ui/dist/trunk/bom</url>
+ </scm>
+
+</project>
Modified: root/ui/dist/trunk/pom.xml
===================================================================
--- root/ui/dist/trunk/pom.xml 2010-06-02 14:30:55 UTC (rev 17464)
+++ root/ui/dist/trunk/pom.xml 2010-06-02 15:40:05 UTC (rev 17465)
@@ -36,6 +36,7 @@
<name>Richfaces UI Assembler</name>
<modules>
+ <module>bom</module>
<!-- aggregate modules -->
<module>richfaces-components-api</module>
<module>richfaces-components-impl</module>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17464 - root/examples/richfaces-showcase/trunk/src/main/webapp/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-06-02 10:30:55 -0400 (Wed, 02 Jun 2010)
New Revision: 17464
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
Log:
Small changes for main showcase demo page
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-02 14:26:06 UTC (rev 17463)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-06-02 14:30:55 UTC (rev 17464)
@@ -30,9 +30,9 @@
<h:outputText value=" | "/>
<h:outputLink value="http://community.jboss.org/community/richfaces">RichFaces Community Space</h:outputLink>
<h:outputText value=" | "/>
- <h:outputLink value="http://downloads.jboss.org/richfaces/milestones/4.0.X/4.0.0.ALPHA2/richfa...">Application War</h:outputLink>
+ <h:outputLink value="http://downloads.jboss.org/richfaces/milestones/4.0.X/4.0.0.ALPHA2/richfa...">Download</h:outputLink>
<h:outputText value=" | "/>
- <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/root/examples/richfaces-showcase/">Application Sources</h:outputLink>
+ <h:outputLink value="http://anonsvn.jboss.org/repos/richfaces/root/examples/richfaces-showcase/">Sources</h:outputLink>
</td>
</tr>
<tr>
@@ -64,7 +64,8 @@
<td class="footer_bg" colspan="2">
<div
class="footer_bg_content rich-page-footer">
- RichFaces 4.0 ALPHA 2</div>
+ #{a4j}
+ </div>
</td>
</tr>
</tbody>
13 years, 11 months
- 1
- 0
JBoss Rich Faces SVN: r17463 - in root: examples/core-demo/trunk and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-06-02 10:26:06 -0400 (Wed, 02 Jun 2010)
New Revision: 17463
Modified:
root/examples/core-demo/trunk/pom.xml
root/examples/iteration-demo/trunk/pom.xml
root/examples/misc-demo/trunk/pom.xml
root/examples/pom.xml
root/examples/repeater-demo/trunk/pom.xml
root/examples/richfaces-showcase/trunk/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Log:
correct dependencies for richfaces-showcase
simplify examples aggregator module
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/core-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -24,18 +24,88 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>examples-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
</parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>core-demo</artifactId>
<packaging>war</packaging>
+ <version>4.0.0-SNAPSHOT</version>
<name>RichFaces Examples: Core</name>
+ <properties>
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <jetty.port>8080</jetty.port>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ </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>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
@@ -48,12 +118,55 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>release</id>
@@ -129,6 +242,36 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
+
+ <repositories>
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
Modified: root/examples/iteration-demo/trunk/pom.xml
===================================================================
--- root/examples/iteration-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/iteration-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -24,25 +24,62 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>examples-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
</parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>iteration-demo</artifactId>
<packaging>war</packaging>
+ <version>4.0.0-SNAPSHOT</version>
<name>RichFaces Examples: Iteration</name>
+ <properties>
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <jetty.port>8080</jetty.port>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-iteration-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -106,6 +143,24 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -114,7 +169,62 @@
<configuration>
<fail>false</fail>
</configuration>
- </plugin>
- </plugins>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jee6</id>
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
Modified: root/examples/misc-demo/trunk/pom.xml
===================================================================
--- root/examples/misc-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/misc-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -24,16 +24,59 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>examples-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
</parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>misc-demo</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>RichFaces Examples: Miscellanous</name>
+ <properties>
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <jetty.port>8080</jetty.port>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
@@ -41,6 +84,34 @@
</dependency>
<dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ </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>
+ </dependency>
+
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
@@ -54,4 +125,82 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jee6</id>
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -26,9 +26,9 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
-
+
<groupId>org.richfaces.examples</groupId>
<artifactId>examples-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
@@ -44,153 +44,4 @@
<!--<module>dist/trunk</module>-->
</modules>
- <properties>
- <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
- <jetty.port>8080</jetty.port>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <!-- simple logger binding: only messages of level INFO and higher are printed-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
- </dependency>
- <dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
- </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>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>jee6</id>
- <dependencies>
- <dependency>
- <groupId>${jsf2.api.groupid}</groupId>
- <artifactId>${jsf2.api.artifactid}</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${jsf2.impl.groupid}</groupId>
- <artifactId>${jsf2.impl.artifactid}</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Configure checkstyle report for this module -->
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-build-checkstyle
- </artifactId>
- <version>${richfaces.checkstyle.version}
- </version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${jetty.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>maven-repository2.dev.java.net</id>
- <name>Java.net Repository for Maven 2</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
\ No newline at end of file
Modified: root/examples/repeater-demo/trunk/pom.xml
===================================================================
--- root/examples/repeater-demo/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/repeater-demo/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -25,21 +25,169 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>examples-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
</parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>repeater-demo</artifactId>
<packaging>war</packaging>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces Examples: Repeater</name>
+ <properties>
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <jetty.port>8080</jetty.port>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ </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>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jee6</id>
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -7,16 +7,59 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>examples-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>7</version>
</parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-showcase</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Richfaces Examples: Richfaces Showcase Application</name>
+ <properties>
+ <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repositories/snapshots/</snapshotRepository>
+ <jetty.port>8080</jetty.port>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <!-- simple logger binding: only messages of level INFO and higher are printed-->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
@@ -24,12 +67,52 @@
</dependency>
<dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-iteration-ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui-misc-ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </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>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+
<dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ </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>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
@@ -37,41 +120,58 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-iteration-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-misc-ui</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
<finalName>richfaces-showcase</finalName>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.18</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${jetty.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>
- <profile>
- <id>jdk5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>release</id>
<build>
@@ -146,6 +246,36 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${jsf2.impl.groupid}</groupId>
+ <artifactId>${jsf2.impl.artifactid}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
+
+ <repositories>
+ <repository>
+ <id>maven-repository2.dev.java.net</id>
+ <name>Java.net Repository for Maven 2</name>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -135,6 +135,13 @@
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 08:16:02 UTC (rev 17462)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 14:26:06 UTC (rev 17463)
@@ -74,6 +74,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -199,6 +200,12 @@
</goals>
<configuration>
<sourcepath>${basedir}/target/dependency</sourcepath>
+<!--
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>${assembly.projects.group}:*-ui:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+-->
</configuration>
</execution>
</executions>
13 years, 11 months
- 1
- 0