modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
| 3
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 86 +-
publish_release.sh
| 318 ++++++++++
3 files changed, 383 insertions(+), 24 deletions(-)
New commits:
commit 7a4fb42be09d40262b34adfe315a206f1c040d74
Merge: 05a44af 94e9024
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 15:59:10 2011 -0400
Merge branch 'release-4.0.0-test-build' of
ssh://git.fedorahosted.org/git/rhq/rhq into release-4.0.0-test-build
commit 05a44af981148899952b5262784d98ca6292ad7b
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 15:03:52 2011 -0400
Adding the rhq-publish-release profile to -P so it is activated
diff --git a/publish_release.sh b/publish_release.sh
index e15857f..534de03 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -177,7 +177,7 @@ MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml"
PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
-MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors
-Penterprise,dist,release"
+MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors
-Prhq-publish-release,enterprise,dist"
if [ "$MODE" = "test" ]; then
MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true"
commit f3cb8a93f0c3b7146c7ea0492cdc38a77cc06da4
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 14:46:43 2011 -0400
Fixing error handling checking for script args
diff --git a/publish_release.sh b/publish_release.sh
index 177a11b..e15857f 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -35,7 +35,7 @@ usage()
# Process command line args.
EXE=`basename $0`
-if [ "$#" -ne 6 ]; then
+if [ "$#" -ne 3 ]; then
usage
fi
RELEASE_TYPE="$1"
commit d729d6ed52c551fe30c69cad4dcd505682211a10
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 13:16:52 2011 -0400
Removing variables that are needed for tagging but not for publishing
diff --git a/publish_release.sh b/publish_release.sh
index cbdcf6f..177a11b 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -28,7 +28,7 @@ abort()
usage()
{
- abort "$@" "Usage: $EXE community|enterprise RELEASE_VERSION
DEVELOPMENT_VERSION RELEASE_BRANCH GIT_USERNAME test|production" "Example: $EXE
enterprise 3.0.0.GA 3.0.0-SNAPSHOT release-3.0.0 ips test"
+ abort "$@" "Usage: $EXE community|enterprise RELEASE_BRANCH
test|production" "Example: $EXE enterprise release-3.0.0 test"
}
@@ -42,11 +42,9 @@ RELEASE_TYPE="$1"
if [ "$RELEASE_TYPE" != "community" ] && [
"$RELEASE_TYPE" != "enterprise" ]; then
usage "Invalid release type: $RELEASE_TYPE (valid release types are
'community' or 'enterprise')"
fi
-RELEASE_VERSION="$2"
-DEVELOPMENT_VERSION="$3"
-RELEASE_BRANCH="$4"
-GIT_USERNAME="$5"
-MODE="$6"
+RELEASE_BRANCH="$2"
+MODE="$3"
+
if [ "$MODE" != "test" ] && [ "$MODE" !=
"production" ]; then
usage "Invalid mode: $MODE (valid modes are 'test' or
'production')"
fi
@@ -205,10 +203,6 @@ fi
#fi
-TAG_VERSION=`echo $RELEASE_VERSION | sed 's/\./_/g'`
-RELEASE_TAG="${TAG_PREFIX}_${TAG_VERSION}"
-
-
# Set the system character encoding to ISO-8859-1 to ensure i18log reads its
# messages and writes its resource bundle properties files in that encoding,
# since that is how the German and French I18NMessage annotation values are
@@ -233,10 +227,8 @@ echo "WORKING_DIR=$WORKING_DIR"
echo "PROJECT_NAME=$PROJECT_NAME"
echo "PROJECT_GIT_URL=$PROJECT_GIT_URL"
echo "RELEASE_TYPE=$RELEASE_TYPE"
-echo "RELEASE_VERSION=$RELEASE_VERSION"
echo "DEVELOPMENT_VERSION=$DEVELOPMENT_VERSION"
echo "RELEASE_BRANCH=$RELEASE_BRANCH"
-echo "RELEASE_TAG=$RELEASE_TAG"
echo "MODE=$MODE"
echo "MAVEN_LOCAL_REPO_DIR=$MAVEN_LOCAL_REPO_DIR"
echo
"MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS=$MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS"
@@ -324,12 +316,3 @@ mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
[ "$?" -ne 0 ] && abort "Release build failed. Please see above
Maven output for details, fix any issues, then try again."
echo
echo "Release build succeeded!"
-
-
-echo
-echo "=============================== Release Info
=================================="
-echo "Version: $RELEASE_VERSION"
-echo "Branch URL:
$PROJECT_GIT_WEB_URL;a=shortlog;h=refs/heads/$RELEASE_BRANCH"
-echo "Tag URL: $PROJECT_GIT_WEB_URL;a=shortlog;h=refs/tags/$RELEASE_TAG"
-echo
"==============================================================================="
-
commit 7d2f1126dc0012d3b8689c92a19225bd03ff1ecf
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 12:57:16 2011 -0400
Look for settings.xml in the workspace.
diff --git a/publish_release.sh b/publish_release.sh
index eb1ce04..cbdcf6f 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -175,6 +175,8 @@ elif [ -z "$WORKING_DIR" ]; then
MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml"
fi
+MAVEN_SETTINGS_FILE="$WORKSPACE/settings.xml"
+
PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors
-Penterprise,dist,release"
commit e7d6b994a7e526ef0ebea87598cc93f9927e95d9
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 12:48:09 2011 -0400
Removing the generated settings.xml from script
The generated settings.xml contained info like internal host names that
should not be put out in the public repo.
diff --git a/publish_release.sh b/publish_release.sh
old mode 100644
new mode 100755
index 71635b3..eb1ce04
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -167,7 +167,7 @@ if [ -n "$HUDSON_URL" ] && [ -n
"$WORKSPACE" ]; then
echo "We appear to be running in a Hudson job."
WORKING_DIR="$WORKSPACE"
MAVEN_LOCAL_REPO_DIR="$HOME/.m2/hudson-release-$RELEASE_TYPE-repository"
- MAVEN_SETTINGS_FILE="$HOME/.m2/hudson-$JOB_NAME-settings.xml"
+ #MAVEN_SETTINGS_FILE="$HOME/.m2/hudson-$JOB_NAME-settings.xml"
elif [ -z "$WORKING_DIR" ]; then
WORKING_DIR="$HOME/release/rhq"
MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository"
@@ -270,55 +270,6 @@ if [ -f "$MAVEN_LOCAL_REPO_DIR" ]; then
fi
mkdir -p "$MAVEN_LOCAL_REPO_DIR"
-
-# Create the Maven settings file.
-cat <<EOF >"${MAVEN_SETTINGS_FILE}"
-<settings>
- <localRepository>$MAVEN_LOCAL_REPO_DIR</localRepository>
-
- <profiles>
-
- <profile>
- <id>release</id>
- <properties>
-<rhq.test.ds.server-name>vmg01.mw.lab.eng.bos.redhat.com</rhq.test.ds.server-name>
- <rhq.db.admin.username>jon2</rhq.db.admin.username>
- <rhq.db.admin.password>jboss42</rhq.db.admin.password>
- <rhq.test.ds.user-name>jon2</rhq.test.ds.user-name>
- <rhq.test.ds.password>jboss42</rhq.test.ds.password>
- <rhq.test.ds.db-name>rhq_release</rhq.test.ds.db-name>
-
<rhq.test.ds.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.test.ds.db-name}</rhq.test.ds.connection-url>
- <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
-
<rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
-
<rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
-
<rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
- <!-- quartz properties -->
-
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
- <rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE
LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
-
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
-
- <DatabaseTest.nofail>true</DatabaseTest.nofail>
-
-
<rhq.testng.excludedGroups>agent-comm,comm-client,postgres-plugin,native-system</rhq.testng.excludedGroups>
-
- <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M
-XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs>
- </properties>
- </profile>
-
- </profiles>
-
- <!-- This is used by the deploy plugin to publish release artifacts to the
jboss.org Nexus repo. -->
- <servers>
- <server>
- <id>jboss-releases-repository</id>
- <username>$JBOSS_ORG_USERNAME</username>
- <password>$JBOSS_ORG_PASSWORD</password>
- </server>
- </servers>
-
-</settings>
-EOF
-
# We only need to worry about cloning the repo if we are not running on hudson
if [ ! "$HUDSON_URL" ]; then
# Clone and/or checkout the source from git.
commit cd645c5f3a0b3c0d4d468bf5c197be007fb2f4f9
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Apr 28 11:42:27 2011 -0400
Initial commit for publish_release script
This script is essentially the portion of the release.sh script that
runs maven to deploy/publish build artifacts. The release script cannot
currently be run from hudson since hudson does not have write access to
the remote git repo.
diff --git a/publish_release.sh b/publish_release.sh
new file mode 100644
index 0000000..71635b3
--- /dev/null
+++ b/publish_release.sh
@@ -0,0 +1,382 @@
+#!/bin/sh
+
+if [ -n "$RELEASE_DEBUG" ]; then
+ echo "Debug output is enabled."
+ set -x
+fi
+
+
+# Constants
+
+PROJECT_NAME="rhq"
+PROJECT_DISPLAY_NAME="RHQ"
+PROJECT_GIT_WEB_URL="http://git.fedorahosted.org/git/?p=rhq/rhq.git"
+TAG_PREFIX="RHQ"
+MINIMUM_MAVEN_VERSION="2.1.0"
+
+
+# Functions
+
+abort()
+{
+ echo >&2
+ for ARG in "$@"; do
+ echo "$ARG" >&2
+ done
+ exit 1
+}
+
+usage()
+{
+ abort "$@" "Usage: $EXE community|enterprise RELEASE_VERSION
DEVELOPMENT_VERSION RELEASE_BRANCH GIT_USERNAME test|production" "Example: $EXE
enterprise 3.0.0.GA 3.0.0-SNAPSHOT release-3.0.0 ips test"
+}
+
+
+# Process command line args.
+
+EXE=`basename $0`
+if [ "$#" -ne 6 ]; then
+ usage
+fi
+RELEASE_TYPE="$1"
+if [ "$RELEASE_TYPE" != "community" ] && [
"$RELEASE_TYPE" != "enterprise" ]; then
+ usage "Invalid release type: $RELEASE_TYPE (valid release types are
'community' or 'enterprise')"
+fi
+RELEASE_VERSION="$2"
+DEVELOPMENT_VERSION="$3"
+RELEASE_BRANCH="$4"
+GIT_USERNAME="$5"
+MODE="$6"
+if [ "$MODE" != "test" ] && [ "$MODE" !=
"production" ]; then
+ usage "Invalid mode: $MODE (valid modes are 'test' or
'production')"
+fi
+
+if [ "$MODE" = "production" ]; then
+ if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ];
then
+ usage "In production mode,
jboss.org credentials must be specified via the
JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ fi
+fi
+
+
+# Make sure JAVA_HOME points to a valid JDK 1.6+ install.
+
+if [ -z "$JAVA_HOME" ]; then
+ abort "JAVA_HOME environment variable is not set - JAVA_HOME must point to a JDK
(not JRE) 6 install dir."
+fi
+
+if [ ! -d "$JAVA_HOME" ]; then
+ abort "JAVA_HOME ($JAVA_HOME) does not exist or is not a directory - JAVA_HOME
must point to a JDK (not JRE) 6 install dir."
+fi
+
+echo "Prepending $JAVA_HOME/bin to PATH..."
+PATH="$JAVA_HOME/bin:$PATH"
+
+if ! which java >/dev/null 2>&1; then
+ abort "java not found in PATH ($PATH) - JAVA_HOME must point to a JDK (not JRE) 6
install dir."
+fi
+
+if ! which javac >/dev/null 2>&1; then
+ abort "javac not found in PATH ($PATH) - JAVA_HOME must point to a JDK (not JRE)
6 install dir."
+fi
+
+if ! javap java.util.Deque >/dev/null 2>&1; then
+ abort "java.util.Deque not found - Java version appears to be less than 1.6 -
Jave version must be 1.6 or later."
+fi
+
+# TODO: Check that JDK version is < 1.7.
+
+
+# If this is an enterprise release, make sure JAVA5_HOME points to a valid JDK 1.5
install.
+# We need this to validate only Java 5 or earlier APIs are used in all modules, except
the CLI, which requires Java 6.
+
+if [ "$RELEASE_TYPE" = "enterprise" ]; then
+ if [ -z "$JAVA5_HOME" ]; then
+ abort "JAVA5_HOME environment variable is not set - JAVA5_HOME must point to
a JDK (not JRE) 1.5 install dir."
+ fi
+
+ if [ ! -d "$JAVA5_HOME" ]; then
+ abort "JAVA5_HOME ($JAVA5_HOME) does not exist or is not a directory -
JAVA5_HOME must point to a JDK (not JRE) 1.5 install dir."
+ fi
+
+ if [ ! -x "$JAVA5_HOME/bin/java" ]; then
+ abort "$JAVA5_HOME/bin/java does not exist or is not executable - JAVA5_HOME
must point to a JDK (not JRE) 1.5 install dir."
+ fi
+
+ if [ ! -x "$JAVA5_HOME/bin/javac" ]; then
+ abort "$JAVA5_HOME/bin/javac does not exist or is not executable - JAVA5_HOME
must point to a JDK (not JRE) 1.5 install dir."
+ fi
+
+ if ! "$JAVA5_HOME/bin/javap" java.lang.Enum >/dev/null 2>&1;
then
+ abort "java.lang.Enum not found - JAVA5_HOME ($JAVA5_HOME) version appears to
be less than 1.5 - version must be 1.5.x."
+ fi
+
+ if "$JAVA5_HOME/bin/javap" java.util.Deque >/dev/null 2>&1; then
+ abort "java.util.Deque found - JAVA5_HOME ($JAVA5_HOME) version appears to be
greater than or equal to 1.6 - version must be 1.5.x."
+ fi
+fi
+
+
+# Make sure M2_HOME points to a valid Maven 2.1.x or 2.2.x install.
+
+if [ -z "$M2_HOME" ]; then
+ abort "M2_HOME environment variable is not set - M2_HOME must point to a Maven,
$MINIMUM_MAVEN_VERSION or later, install dir."
+fi
+
+if [ ! -d "$M2_HOME" ]; then
+ abort "M2_HOME ($M2_HOME) does not exist or is not a directory - M2_HOME must
point to a Maven, $MINIMUM_MAVEN_VERSION or later, install dir."
+fi
+
+echo "Prepending $M2_HOME/bin to PATH..."
+PATH="$M2_HOME/bin:$PATH"
+
+if ! which mvn >/dev/null 2>&1; then
+ abort "mvn not found in PATH ($PATH) - M2_HOME must point to a Maven,
$MINIMUM_MAVEN_VERSION or later, install dir."
+fi
+
+mvn -version >/dev/null
+[ $? -ne 0 ] && abort "mvn --version failed with exit code $?."
+MAVEN_VERSION=`mvn -version | head -1 | sed 's|[^0-9]*\([^ ]*\).*|\1|'`
+if echo $MAVEN_VERSION | grep -Ev "^(2\.[12]|3\.0)"; then
+ abort "Unsupported Maven version - $MAVEN_VERSION. Only Maven 2.1.x, 2.2.x, or
3.0.x is supported. Please update the value of M2_HOME, then try again."
+fi
+
+
+# Make sure git 1.6.x or 1.7.x is in the PATH.
+
+if ! which git >/dev/null 2>&1; then
+ abort "git not found in PATH ($PATH)."
+fi
+
+git --version >/dev/null
+[ $? -ne 0 ] && abort "git --version failed with exit code $?."
+GIT_VERSION=`git --version | sed 's|[^0-9]*\([^ ]*\).*|\1|'`
+if echo $GIT_VERSION | grep -v "^1.[67]"; then
+ abort "Unsupported git version - $GIT_VERSION. Only git 1.6.x or 1.7.x are
supported. Please add a directory containing a supported version of git to your PATH, then
try again."
+fi
+
+
+# Set various environment variables.
+
+MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
+export MAVEN_OPTS
+
+
+# Set various local variables.
+
+if [ -n "$HUDSON_URL" ] && [ -n "$WORKSPACE" ]; then
+ echo "We appear to be running in a Hudson job."
+ WORKING_DIR="$WORKSPACE"
+ MAVEN_LOCAL_REPO_DIR="$HOME/.m2/hudson-release-$RELEASE_TYPE-repository"
+ MAVEN_SETTINGS_FILE="$HOME/.m2/hudson-$JOB_NAME-settings.xml"
+elif [ -z "$WORKING_DIR" ]; then
+ WORKING_DIR="$HOME/release/rhq"
+ MAVEN_LOCAL_REPO_DIR="$HOME/release/m2-repository"
+ #MAVEN_LOCAL_REPO_DIR="$HOME/.m2/repository"
+ MAVEN_SETTINGS_FILE="$HOME/release/m2-settings.xml"
+fi
+
+PROJECT_GIT_URL="git://git.fedorahosted.org/rhq/rhq.git"
+
+MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors
-Penterprise,dist,release"
+
+if [ "$MODE" = "test" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true"
+fi
+
+if [ "$RELEASE_TYPE" = "enterprise" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre"
+fi
+if [ -n "$RELEASE_DEBUG" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS --debug"
+fi
+if [ -n "$RELEASE_ADDITIONAL_MAVEN_ARGS" ]; then
+ MAVEN_ARGS="$MAVEN_ARGS $RELEASE_ADDITIONAL_MAVEN_ARGS"
+fi
+if [ -z "$MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS" ]; then
+ MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS="6"
+fi
+
+#if [ "$MODE" = "production" ] && [ "$RELEASE_TYPE"
= "community" ]; then
+# MAVEN_RELEASE_PERFORM_GOAL="deploy"
+#else
+ MAVEN_RELEASE_PERFORM_GOAL="install"
+#fi
+
+
+TAG_VERSION=`echo $RELEASE_VERSION | sed 's/\./_/g'`
+RELEASE_TAG="${TAG_PREFIX}_${TAG_VERSION}"
+
+
+# Set the system character encoding to ISO-8859-1 to ensure i18log reads its
+# messages and writes its resource bundle properties files in that encoding,
+# since that is how the German and French I18NMessage annotation values are
+# encoded and the encoding used by i18nlog to read in resource bundle
+# property files.
+LANG=en_US.iso8859
+export LANG
+
+
+# Print out a summary of the environment.
+
+echo
+echo "========================== Environment Variables
=============================="
+echo "JAVA_HOME=$JAVA_HOME"
+[ "$RELEASE_TYPE" = "enterprise" ] && echo
"JAVA5_HOME=$JAVA5_HOME"
+echo "M2_HOME=$M2_HOME"
+echo "MAVEN_OPTS=$MAVEN_OPTS"
+echo "PATH=$PATH"
+echo "LANG=$LANG"
+echo "============================= Local Variables
================================="
+echo "WORKING_DIR=$WORKING_DIR"
+echo "PROJECT_NAME=$PROJECT_NAME"
+echo "PROJECT_GIT_URL=$PROJECT_GIT_URL"
+echo "RELEASE_TYPE=$RELEASE_TYPE"
+echo "RELEASE_VERSION=$RELEASE_VERSION"
+echo "DEVELOPMENT_VERSION=$DEVELOPMENT_VERSION"
+echo "RELEASE_BRANCH=$RELEASE_BRANCH"
+echo "RELEASE_TAG=$RELEASE_TAG"
+echo "MODE=$MODE"
+echo "MAVEN_LOCAL_REPO_DIR=$MAVEN_LOCAL_REPO_DIR"
+echo
"MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS=$MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS"
+echo "MAVEN_SETTINGS_FILE=$MAVEN_SETTINGS_FILE"
+echo "MAVEN_ARGS=$MAVEN_ARGS"
+echo "MAVEN_RELEASE_PERFORM_GOAL=$MAVEN_RELEASE_PERFORM_GOAL"
+echo "JBOSS_ORG_USERNAME=$JBOSS_ORG_USERNAME"
+echo "============================= Program Versions
================================"
+git --version
+echo
+java -version
+echo
+mvn --version | head -1
+echo
"==============================================================================="
+echo
+
+
+# Clean the Maven local repo if it hasn't been purged recently.
+
+if [ -f "$MAVEN_LOCAL_REPO_DIR" ]; then
+ if [ "$MODE" = "production" ]; then
+ echo "Purging MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) since this is a
production build..."
+ #rm -rf "$MAVEN_LOCAL_REPO_DIR"
+ else
+ echo boo
+ #OUTPUT=`find "$MAVEN_LOCAL_REPO_DIR" -maxdepth 0 -mtime
$MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS`
+ #if [ -n "$OUTPUT" ]; then
+ # echo "MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) has existed for more
than $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS hours - purging it for a clean-clean
build..."
+ # rm -rf "$MAVEN_LOCAL_REPO_DIR"
+ #fi
+ fi
+
+fi
+mkdir -p "$MAVEN_LOCAL_REPO_DIR"
+
+
+# Create the Maven settings file.
+cat <<EOF >"${MAVEN_SETTINGS_FILE}"
+<settings>
+ <localRepository>$MAVEN_LOCAL_REPO_DIR</localRepository>
+
+ <profiles>
+
+ <profile>
+ <id>release</id>
+ <properties>
+<rhq.test.ds.server-name>vmg01.mw.lab.eng.bos.redhat.com</rhq.test.ds.server-name>
+ <rhq.db.admin.username>jon2</rhq.db.admin.username>
+ <rhq.db.admin.password>jboss42</rhq.db.admin.password>
+ <rhq.test.ds.user-name>jon2</rhq.test.ds.user-name>
+ <rhq.test.ds.password>jboss42</rhq.test.ds.password>
+ <rhq.test.ds.db-name>rhq_release</rhq.test.ds.db-name>
+
<rhq.test.ds.connection-url>jdbc:postgresql://${rhq.test.ds.server-name}:5432/${rhq.test.ds.db-name}</rhq.test.ds.connection-url>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+
<rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+
<rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+
<rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
+ <!-- quartz properties -->
+
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
+ <rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE
LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
+
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+
+ <DatabaseTest.nofail>true</DatabaseTest.nofail>
+
+
<rhq.testng.excludedGroups>agent-comm,comm-client,postgres-plugin,native-system</rhq.testng.excludedGroups>
+
+ <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M
-XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs>
+ </properties>
+ </profile>
+
+ </profiles>
+
+ <!-- This is used by the deploy plugin to publish release artifacts to the
jboss.org Nexus repo. -->
+ <servers>
+ <server>
+ <id>jboss-releases-repository</id>
+ <username>$JBOSS_ORG_USERNAME</username>
+ <password>$JBOSS_ORG_PASSWORD</password>
+ </server>
+ </servers>
+
+</settings>
+EOF
+
+# We only need to worry about cloning the repo if we are not running on hudson
+if [ ! "$HUDSON_URL" ]; then
+ # Clone and/or checkout the source from git.
+
+ if [ -d "$WORKING_DIR" ]; then
+ cd "$WORKING_DIR"
+ git status >/dev/null 2>&1
+ GIT_STATUS_EXIT_CODE=$?
+ # Note, git 1.6 and earlier returns an exit code of 1, rather than 0, if there
are any uncommitted changes,
+ # and git 1.7 returns 0, so we check if the exit code is less than or equal to 1
to determine if $WORKING_DIR
+ # is truly a git working copy.
+ if [ "$GIT_STATUS_EXIT_CODE" -le 1 ]; then
+ echo "Checking out a clean copy of the release branch
($RELEASE_BRANCH)..."
+ git fetch origin "$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to fetch release
branch ($RELEASE_BRANCH)."
+ git checkout "$RELEASE_BRANCH" 2>/dev/null
+ if [ "$?" -ne 0 ]; then
+ git checkout --track -b "$RELEASE_BRANCH"
"origin/$RELEASE_BRANCH"
+ fi
+ [ "$?" -ne 0 ] && abort "Failed to checkout release
branch ($RELEASE_BRANCH)."
+ git reset --hard "origin/$RELEASE_BRANCH"
+ [ "$?" -ne 0 ] && abort "Failed to reset release
branch ($RELEASE_BRANCH)."
+ git clean -dxf
+ [ "$?" -ne 0 ] && abort "Failed to clean release
branch ($RELEASE_BRANCH)."
+ git pull
+ [ "$?" -ne 0 ] && abort "Failed to update release
branch ($RELEASE_BRANCH)."
+ else
+ echo "$WORKING_DIR does not appear to be a git working directory
('git status' returned $GIT_STATUS_EXIT_CODE) - removing it so we can freshly
clone the repo..."
+ cd ..
+ rm -rf "$WORKING_DIR"
+ [ "$?" -ne 0 ] && abort "Failed to remove bogus
working directory ($WORKING_DIR)."
+ fi
+ fi
+
+ if [ ! -d "$WORKING_DIR" ]; then
+ echo "Cloning the $PROJECT_NAME git repo (this will take about 10-15
minutes)..."
+ git clone "$PROJECT_GIT_URL" "$WORKING_DIR"
+ [ "$?" -ne 0 ] && abort "Failed to clone $PROJECT_NAME git
repo ($PROJECT_GIT_URL)."
+ cd "$WORKING_DIR"
+ if [ "$RELEASE_BRANCH" != "master" ]; then
+ git checkout --track -b $RELEASE_BRANCH "origin/$RELEASE_BRANCH"
+ fi
+ [ "$?" -ne 0 ] && abort "Failed to checkout release branch
($RELEASE_BRANCH)."
+ fi
+fi
+
+
+echo "Building release from tag and publishing Maven artifacts (this will take about
10-15 minutes)..."
+mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
+[ "$?" -ne 0 ] && abort "Release build failed. Please see above
Maven output for details, fix any issues, then try again."
+echo
+echo "Release build succeeded!"
+
+
+echo
+echo "=============================== Release Info
=================================="
+echo "Version: $RELEASE_VERSION"
+echo "Branch URL:
$PROJECT_GIT_WEB_URL;a=shortlog;h=refs/heads/$RELEASE_BRANCH"
+echo "Tag URL: $PROJECT_GIT_WEB_URL;a=shortlog;h=refs/tags/$RELEASE_TAG"
+echo
"==============================================================================="
+
commit 4ae8ecc92c1f96bd9d1bf1ce5c1a4b7935c1ab53
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Apr 28 09:51:43 2011 -0400
BZ 700226 - be able to delete multiple config history items
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
index 72966cf..07c4080 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
@@ -97,7 +97,8 @@ public abstract class AbstractConfigurationHistoryView<T extends
AbstractConfigu
int[] doomedIds = new int[selection.length];
int i = 0;
for (ListGridRecord selected : selection) {
- doomedIds[i] =
selected.getAttributeAsInt(AbstractConfigurationHistoryDataSource.Field.ID);
+ doomedIds[i++] = selected
+
.getAttributeAsInt(AbstractConfigurationHistoryDataSource.Field.ID);
if (selected
.getAttribute(AbstractConfigurationHistoryDataSource.Field.GROUP_CONFIG_UPDATE_ID) !=
null) {
CoreGUI.getMessageCenter().notify(
commit 1bc94394eb58cf626d436577ee30618318047232
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 21:18:04 2011 +0200
Some more translations.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 667f040..dfaf432 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -162,6 +162,8 @@ common_msg_deleteConfirm = Are you sure you want to delete the #
selected {0}?~
common_msg_emphasizedNotePrefix = Achtung:
common_msg_loading = Laden...
common_msg_noItemsToShow=Keine Einträge vorhanden
+common_msg_step_x_of_y = Schritt {0} von {1}
+
# Common Values
#--------------
@@ -194,8 +196,8 @@ common_calendar_december_short=Dez
# Record Editor
#--------------
-widget_recordEditor_title_view = Anzeigen {0} [{1}]~
-widget_recordEditor_title_edit = Bearbeiten {0} [{1}]~
+widget_recordEditor_title_view = Anzeigen {0} [{1}]
+widget_recordEditor_title_edit = Bearbeiten {0} [{1}]
widget_recordEditor_title_new = Neue {0} anlegen
# // dup in common
widget_recordEditor_label_loading = Laden...
@@ -370,7 +372,7 @@ dataSource_problemResources_error_fetchFailure = Konnte die Liste der
Ressourcen
# Recent Operations
#----------------------------
dataSource_recentOperations_field_resource = Ressource
-dataSource_recentOperations_field_location = ort
+dataSource_recentOperations_field_location = Ort
dataSource_recentOperations_field_operation = Operation
dataSource_recentOperations_field_time = Zeitpunkt
dataSource_recentOperations_field_status = Status
@@ -399,7 +401,6 @@ dataSource_configurationHistory_error_fetchFailure = Konnte den
Verlauf der Ress
# Resource Errors
#-------------------------
dataSource_resourceErrors_field_summary = Zsuammenfassung
-dataSource_resourceErrors_field_detail = Detailierte Nachricht
dataSource_resourceErrors_field_errorType = Fehlertyp
dataSource_resourceErrors_field_timeOccured = Zeitpunkt
dataSource_resourceErrors_error_fetchFailure = Konnte die spezifischen Fehler für die
Ressource mit id [{0}] nicht laden.
@@ -448,9 +449,9 @@ view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups
available for ro
view_adminRoles_failRoles = Konnte die Rollen nicht laden.
view_adminRoles_globalPerms = Applikationsweite Rechte
view_adminRoles_ldapGroups = LDAP-Gruppen
-view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only~
+view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden
view_adminRoles_noItems = Keine Einträge vorhanden
-view_adminRoles_noLdap = The LDAP security integration is not configured. To configure
LDAP go to <a {0}>{1}</a>.~
+view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu
konfigurieren, wechseln sie zu <a {0}>{1}</a>.
view_adminRoles_perms = Rechte
view_adminRoles_resourcePerms = Rechte auf Ressourcen
view_adminRoles_roleAdded = Rolle [{0}] hinzugefügt
@@ -492,8 +493,8 @@ view_remoteAgentInstall_success = Agent installation complete~
view_remoteAgentInstall_updateStatus = Update Status~
#==================== Alerts ======================
-view_alerts_table_title_group=Group Alert History~
-view_alerts_table_title_resource=Resource Alert History~
+view_alerts_table_title_group=Verlauf Gruppen-Alarme
+view_alerts_table_title_resource=Verlauf Ressourcen-Alarme
view_alerts_table_filter_priority=Filter nach Priorität
view_alerts_field_created_time=Erstellungszeitpunkt
view_alerts_field_modified_time=Zuletzt geändert
@@ -531,13 +532,13 @@ view_alert_definitions_table_title_group=Alarm-Definitionen für
Gruppen
view_alert_definitions_table_title_resource=Alarm-Definitionen für Ressourcen
view_alert_definitions_loadFailed=Failed to fetch alert definition data~
view_alert_definitions_loadFailed_single=Failed to fetch data for alert definition with
id {0}~
-view_alert_definitions_enable_confirm=Enable the selected alert definition(s)?~
+view_alert_definitions_enable_confirm=Die auusgewählten Alarm-Definitionen aktivieren?
view_alert_definitions_enable_success=Successfully enabled {0} alert definitions~
view_alert_definitions_enable_failure=Failed to enable the selected alert definitions~
-view_alert_definitions_disable_confirm=Disable the selected alert definition(s)?~
+view_alert_definitions_disable_confirm=Die ausgewählten Alram-Definitionen deaktivieren?
view_alert_definitions_disable_success=Successfully disabled {0} alert definitions~
view_alert_definitions_disable_failure=Failed to disable the selected alert definitions~
-view_alert_definitions_delete_confirm=Delete the selected alert definition(s)?~
+view_alert_definitions_delete_confirm=Die ausgewählten Alarm-Definitionen löschen?
view_alert_definitions_delete_success=Successfully deleted {0} alert definitions~
view_alert_definitions_delete_failure=Failed to deleted the selected alert definitions~
view_alert_definitions_create_success=Alarm-Definition erfolgreich angelegt
@@ -928,13 +929,7 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property
[{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
view_measure_nan = --keine Daten verfügbar--~
-view_measureRange_day = 1 Tag
-view_measureRange_days = {0} Tage
-view_measureRange_hour = 1 Stunde
-view_measureRange_hours = {0} Stunden
view_measureRange_last = Letzte
-view_measureRange_minutes = {0} Minuten
-view_measureRange_range = Zeitraum
view_measureRange_simple = Einfach...
view_selector_assigned = Zugewiesen {0}
@@ -964,7 +959,6 @@ view_upload_error_results = Error uploading file, unexpected results:
[{0}]~
view_upload_inProgress = Can not submit, upload is currently in progress~
view_upload_prompt_1 = [{0}] File to Upload~
view_upload_prompt_2 = File to Upload~
-view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~
view_upload_tooltip_2 = File upload had previously failed~
view_upload_success = File successfully uploaded~
view_upload_upload = Hochladen
@@ -972,13 +966,13 @@ view_upload_uploadFile = UploadFile~
# Group Create Wizard
view_groupCreateWizard_membersStepName=Wählen Sie die Gruppenmitglieder aus
-view_groupCreateWizard_createStepName=Group Settings~
+view_groupCreateWizard_createStepName=Einstellungen für die Gruppe
view_groupCreateWizard_createStep_recursive=Rekursiv
view_groupCreateWizard_title=Gruppe anlegen
view_groupCreateWizard_windowTitle=Gruppe anlegen
view_groupCreateWizard_createFailure=Konnte die Ressourcen-Gruppe nicht anlegen
-view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]~
-view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group
with the name [{1}] that contains [{2}] member resources~
+view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]
+view_groupCreateWizard_createSuccessful_full=Sie haben eine neue [{0}] Gruppe mit dem
Namen [{1}] mit [{2}] Ressourcen angelegt.
# Resource Type / Plugin View/Datasources
view_type_resourceTypes=Ressourcen-Typen
@@ -1489,7 +1483,6 @@ common_title_resourceGroups=Ressourcen-Gruppen
common_title_server=Server
common_title_service=Dienste
common_title_users=Benutzer
-dataSource_operationHistory_startedTime=Startzeitpunkt
view_tabs_common_agent=Agent
common_title_bundle=Bundle
common_title_bundles=Bundles
@@ -1497,7 +1490,6 @@ common_val_n1st={0}er
common_val_n2nd={0}er
common_val_n3rd={0}er
common_val_nth={0}er
-dataSource_operationHistory_operationName=Name der Operation
view_autoDiscoveryQ_deleted=Gelöscht
view_adminRoles_permissions_globalPermissions=Globale Rechte
view_adminRoles_permissions_resourcePermissions=Rechte für Ressourcen
@@ -1683,6 +1675,54 @@ view_operationScheduleDetails_enterParametersBelow=Geben Sie die
Parameter unten
view_operationScheduleDetails_field_description=Beschreibung
view_operationScheduleDetails_field_parameters=Parameter
view_operationScheduleDetails_noParameters=Diese Operation benötigt keine Parameter.
+common_button_schedule=Planen
+common_button_set=Setzen
+common_status_deferred=Verzögert
+common_status_nochange=Keine Änderung
+common_status_partial=partiell
+common_title_compare_metrics=Metriken vergleichen
+common_title_config_update_status=Status aktualisieren
+common_title_dateRange=Zeitraum
+common_title_members_reporting=Anzahl berichtender Mitglieder
+common_title_group_member_health=Zustand der Gruppenmitglieder
+common_title_numeric_metrics=Numerische Metriken
+dataSource_operationHistory_field_createdTime=Erstellungszeitpunkt
+dataSource_operationHistory_field_operationName=Name der Operation
+dataSource_operationHistory_field_startedTime=Startzeitpunkt
+dataSource_operationHistory_field_subject=Ersteller
+dataSource_operationSchedule_field_description=Notizen
+dataSource_operationSchedule_field_nextFireTime=Nächste Ausführung
+dataSource_operationSchedule_field_operationDisplayName=Operation
+dataSource_operationSchedule_field_operationName=Operation
+dataSource_operationSchedule_field_subject=Eigentümer
+dataSource_operationSchedule_field_timeout=Timeout (in Sekunden)
+dataSource_resourceErrors_clickStatusIcon=Für mehr Details auf das Icon klicken
+dataSource_resourceErrors_deleteFailure=Konnte die Ressourcen-Fehler nicht löschen
+dataSource_resourceErrors_deleteSuccess=Sie haben erfolgreich [{0}]
Ressourcen-Fehlermeldungen gelöscht.
+group_tree_partialClusterTooltip={0} der {1} Gruppenmitglieder haben eine
''{2}'' Ressource
+view_adminTemplates_servers=Server
+view_adminTemplates_platforms=Platformen
+view_alert_definition_condition_editor_delete_confirm=Die ausgewählte(n)
Alarm-Bedingung(en) löschen?
+view_bundle_fileListView_md5=MD5
+view_bundle_fileListView_sha256=SHA256
+view_group_detail_failRecursiveChange=Konnte die Einstellung ''Rekursiv''
für die Gruppe [{0}] nicht aktualisieren
+view_group_detail_recursiveChange=Sie haben erfolgreich die
''Rekursiv''-Einstellung für die Gruppe [{0}] geändert.
+view_groupInventoryMembers_button_updateMembership=Mitgliedschaft aktualisieren...
+view_groupInventoryMembers_title_updateMembership=Mitgliedschaft aktualisieren
+view_measureRange_start=Zeitraum - Start
+view_measureTable_chartMetricValues=Graphen für ausgewählte Metriken anzeigen
+view_measureTable_getLive=Aktuellen Wert holen
+view_messageCenter_maxMessages=Alle Nachrichten
+view_resource_monitor_table_alerts=Alarme
+view_resource_monitor_table_avg=Durchschnitt
+view_resource_monitor_table_last=Letzter
+view_resource_monitor_table_max=Maximum
+view_resource_monitor_table_min=Minimum
+view_table_matchingRows=Zutreffende Zeilen: {0} (ausgewählt: {1})
+view_tabs_common_activity=Aktivität
+view_tabs_common_group_members=Gruppenmitglieder
+view_tabs_common_schedule=Zeitplan
+widget_resourceFactoryWizard_editConfigStep_nothingToDo=Es gibt keine Konfiguration, die
Sie für diese Ressource bearbeiten können.