modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp
| 242 +++++-----
release.sh
| 74 +--
2 files changed, 163 insertions(+), 153 deletions(-)
New commits:
commit 1e10fbe07f2d55aa118baffbaec4e02127983ff5
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 29 16:33:27 2010 -0400
Work to perform rhq tag release script in its own branch
diff --git a/release.sh b/release.sh
index 2722eda..c4b9e46 100755
--- a/release.sh
+++ b/release.sh
@@ -286,7 +286,6 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}"
</settings>
EOF
-
# Clone and/or checkout the source from git.
if [ -d "$WORKING_DIR" ]; then
@@ -328,15 +327,42 @@ if [ ! -d "$WORKING_DIR" ]; then
fi
-# If the specified tag already exists remotely and we're in production mode, then
abort. If it exists and we're in test mode, then we'll delete it after we've
had a successful dry run of release:prepare and are ready to tag.
+# If the specified tag already exists then abort. It should not exist since production
runs should have
+# unique tags and test runs should have been done in a temporary branch
EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"`
-if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" =
"production" ]; then
- abort "A remote tag named $RELEASE_TAG already exists - aborting, since we are in
production mode..."
+if [ -n "$EXISTING_REMOTE_TAG" ]; then
+ abort "A remote tag named $RELEASE_TAG already exists - aborting, perhaps a bad
build configuration..."
fi
-# Run a test build before tagging. This will also publish the snapshot artifacts to the
local repo to "bootstrap" the repo.
+# if this is a test build then create a temporary build branch off of RELEASE_BRANCH.
This allows checkins to
+# continue in RELEASE_BRANCH without affecting the release plugin work, which will fail
if the branch contents
+# change before it completes.
+if [ "$MODE" = "production" ]; then
+ BUILD_BRANCH="${RELEASE_BRANCH}"
+else
+ BUILD_BRANCH="${RELEASE_BRANCH}-test-build"
+# delete the branch if it exists, so we can recreate it fresh
+ EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"`
+ if [ "$EXISTING_REMOTE_TAG" ]; then
+ echo "Deleting remote branch origin/$BUILD_BRANCH"
+ git branch -D -r "origin/$BUILD_BRANCH"
+ echo "Deleting local branch $BUILD_BRANCH"
+ git branch -D "$BUILD_BRANCH"
+ fi
+ echo "Creating and checking out local branch $BUILD_BRANCH from
$RELEASE_BRANCH"
+ git checkout -b "$BUILD_BRANCH"
+ echo "Creating remote branch $BUILD_BRANCH"
+ git push origin "$BUILD_BRANCH"
+fi
+
+
+# We should now have the build_branch checked out
+echo "Current Branch is $BUILD_BRANCH"
+
+
+# Run a test build before tagging. This will publish the snapshot artifacts to the local
repo to "bootstrap" the repo.
echo "Building project to ensure tests pass and to bootstrap local Maven repo (this
will take about 15-30 minutes)..."
# NOTE: There is no need to do a mvn clean below, since we just did either a clone or
clean checkout above.
@@ -347,42 +373,26 @@ echo "Test build succeeded!"
# Clean up the snapshot jars produced by the test build from module target dirs.
-
echo "Cleaning up snapshot jars produced by test build from module target
dirs..."
mvn clean $MAVEN_ARGS
[ "$?" -ne 0 ] && abort "Failed to cleanup snbapshot jars produced
by test build from module target dirs. Please see above Maven output for details, fix any
issues, then try again."
-# Do a dry run of tagging the release.
+# If this is a production build perform a dry run of tagging the release. Skip this for
test builds to reduce the
+# build time
-echo "Doing a dry run of tagging the release..."
-mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION
-DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG
"-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true
-Ddbsetup-do-not-check-schema=true" -DdryRun=true
-[ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above
Maven output for details, fix any issues, then try again."
-mvn release:clean $MAVEN_ARGS
-[ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working
files from tagging dry run. Please see above Maven output for details, fix any issues,
then try again."
-echo
-echo "Tagging dry run succeeded!"
-
-
-# If there's an existing remote tag, and we didn't abort earlier, we must be in
test mode, so we can safely delete it before we call mvn release:prepare to recreate it.
-
-if [ -n "$EXISTING_REMOTE_TAG" ]; then
- echo "A remote tag named $RELEASE_TAG already exists - deleting it, since we are
in test mode..."
- git push origin ":refs/tags/$RELEASE_TAG"
- [ "$?" -ne 0 ] && abort "Failed to delete remote tag
($RELEASE_TAG)."
-fi
-
-
-# See if the specified tag already exists locally - if so, delete it (even if in
production mode).
-EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"`
-if [ -n "$EXISTING_LOCAL_TAG" ]; then
- echo "A local tag named $RELEASE_TAG already exists - deleting it..."
- git tag -d "$RELEASE_TAG"
- [ "$?" -ne 0 ] && abort "Failed to delete local tag
($RELEASE_TAG)."
+if [ "$MODE" = "production" ]; then
+ echo "Doing a dry run of tagging the release..."
+ mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION
-DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG
"-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true
-Ddbsetup-do-not-check-schema=true" -DdryRun=true
+ [ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see
above Maven output for details, fix any issues, then try again."
+ mvn release:clean $MAVEN_ARGS
+ [ "$?" -ne 0 ] && abort "Failed to cleanup release plugin
working files from tagging dry run. Please see above Maven output for details, fix any
issues, then try again."
+ echo
+ echo "Tagging dry run succeeded!"
fi
-# If the dry run succeeded, tag it for real.
+# If the dry run was skipped or succeeded, tag it for real.
echo "Tagging the release..."
mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION
-DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG
"-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true
-Ddbsetup-do-not-check-schema=true" -DdryRun=false -Dusername=$GIT_USERNAME
commit 436507fb74a475f4c1161becf06c5331c7ae9fbf
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 29 16:50:31 2010 -0400
LT commit
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp
index 7b91970..2c8a8a2 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp
@@ -1,121 +1,121 @@
-<%@ page language="java" %>
-<%@ page errorPage="/common/Error.jsp" %>
-
-<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
-<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html-el"
prefix="html" %>
-<%@ taglib
uri="http://jakarta.apache.org/struts/tags-tiles"
prefix="tiles" %>
-<%@ taglib
uri="http://jakarta.apache.org/struts/tags-logic"
prefix="logic" %>
-<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
-<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %>
-
-<script src="<html:rewrite page="/js/"/>functions.js"
type="text/javascript"></script>
-<link rel=stylesheet href="<html:rewrite
page="/css/"/>win.css" type="text/css">
-
-<hq:constant
- classname="org.rhq.enterprise.gui.legacy.Constants"
- symbol="MINUTES_LABEL" var="CONST_MINUTES" />
-<hq:constant
- classname="org.rhq.enterprise.gui.legacy.Constants"
- symbol="HOURS_LABEL" var="CONST_HOURS" />
-<hq:constant
- classname="org.rhq.enterprise.gui.legacy.Constants"
- symbol="DAYS_LABEL" var="CONST_DAYS" />
-
-<!-- BASE SERVER CONFIG TITLE -->
-<tiles:insert definition=".header.tab">
- <tiles:put name="tabKey"
value="admin.settings.BaseConfigTab"/>
-</tiles:insert>
-<!-- / -->
-
-<!-- BASE SERVER CONFIG CONTENTS -->
-<table width="100%" cellpadding="0" cellspacing="0"
border="0">
- <tr>
- <td width="45%" class="BlockLabel"><fmt:message
key="admin.settings.BaseURL"/></td>
- <td width="55%" class="BlockContent"><html:text
size="31" property="baseUrl" /></td>
- </tr>
- <tr>
- <td class="BlockLabel"><fmt:message
key="admin.settings.AgentMaxQuietTimeAllowed"/></td>
- <td class="BlockContent">
- <table width="100%" cellpadding="0"
cellspacing="0" border="0">
- <tr>
-<logic:messagesPresent property="agentMaxQuietTimeAllowedVal">
- <td class="ErrorField">
- <html:text size="2"
property="agentMaxQuietTimeAllowedVal" />
- </td>
- <td class="ErrorField" width="100%">
- <html:select property="agentMaxQuietTimeAllowed">
- <html:option value="${CONST_MINUTES}"><fmt:message
key="admin.settings.Minutes"/></html:option>
- </html:select>
- </td>
-</logic:messagesPresent>
-<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal">
- <td class="BlockContent">
- <html:text size="2"
property="agentMaxQuietTimeAllowedVal" />
- </td>
- <td class="BlockContent" width="100%">
- <html:select property="agentMaxQuietTimeAllowed">
- <html:option value="${CONST_MINUTES}"><fmt:message
key="admin.settings.Minutes"/></html:option>
- </html:select>
- </td>
-</logic:messagesNotPresent>
- </tr>
-<logic:messagesPresent property="agentMaxQuietTimeAllowedVal">
- <tr>
- <td class="ErrorField" colspan="2">
- <span class="ErrorFieldContent"> <html:errors
property="agentMaxQuietTimeAllowedVal"/></span>
- </td>
- </tr>
-</logic:messagesPresent>
-<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal">
- <tr>
- <td class="BlockContent" colspan="2">
- </td>
- </tr>
-</logic:messagesNotPresent>
- </table>
- </td>
- </tr>
- <tr>
- <td class="BlockLabel"><fmt:message
key="admin.settings.EnableAgentAutoUpdate"/></td>
- <td class="BlockContent">
- <table cellpadding="0" cellspacing="4"
border="0">
- <tr>
- <td align="left"><html:radio
property="enableAgentAutoUpdate" value="true"/><fmt:message
key="yesno.true"/></td>
- <td align="left"><html:radio
property="enableAgentAutoUpdate" value="false"/><fmt:message
key="yesno.false"/></td>
- </tr>
- </table>
- </td>
- </tr>
-
-<hq:authorization permission="superuser">
- <tr>
- <td class="BlockLabel"><fmt:message
key="admin.settings.EnableDebugMode"/></td>
- <td class="BlockContent">
- <table cellpadding="0" cellspacing="4"
border="0">
- <tr>
- <td align="left"><html:radio
property="enableDebugMode" value="true"/><fmt:message
key="yesno.true"/></td>
- <td align="left"><html:radio
property="enableDebugMode" value="false"/><fmt:message
key="yesno.false"/></td>
- </tr>
- </table>
- </td>
- </tr>
-</hq:authorization>
-
-<fmt:message var="productName" key="product.shortName" />
-<c:if test="${productName eq 'RHQ'}">
-<hq:authorization permission="superuser">
- <tr>
- <td class="BlockLabel"><fmt:message
key="admin.settings.EnableExperimentalFeatures"/></td>
- <td class="BlockContent">
- <table cellpadding="0" cellspacing="4"
border="0">
- <tr>
- <td align="left"><html:radio
property="enableExperimentalFeatures" value="true"/><fmt:message
key="yesno.true"/></td>
- <td align="left"><html:radio
property="enableExperimentalFeatures"
value="false"/><fmt:message key="yesno.false"/></td>
- </tr>
- </table>
- </td>
- </tr>
-</hq:authorization>
-</c:if>
-
-</table>
+<%@ page language="java" %>
+<%@ page errorPage="/common/Error.jsp" %>
+
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html-el"
prefix="html" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-tiles"
prefix="tiles" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-logic"
prefix="logic" %>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %>
+
+<script src="<html:rewrite page="/js/"/>functions.js"
type="text/javascript"></script>
+<link rel=stylesheet href="<html:rewrite
page="/css/"/>win.css" type="text/css">
+
+<hq:constant
+ classname="org.rhq.enterprise.gui.legacy.Constants"
+ symbol="MINUTES_LABEL" var="CONST_MINUTES" />
+<hq:constant
+ classname="org.rhq.enterprise.gui.legacy.Constants"
+ symbol="HOURS_LABEL" var="CONST_HOURS" />
+<hq:constant
+ classname="org.rhq.enterprise.gui.legacy.Constants"
+ symbol="DAYS_LABEL" var="CONST_DAYS" />
+
+<!-- BASE SERVER CONFIG TITLE -->
+<tiles:insert definition=".header.tab">
+ <tiles:put name="tabKey"
value="admin.settings.BaseConfigTab"/>
+</tiles:insert>
+<!-- / -->
+
+<!-- BASE SERVER CONFIG CONTENTS -->
+<table width="100%" cellpadding="0" cellspacing="0"
border="0">
+ <tr>
+ <td width="45%" class="BlockLabel"><fmt:message
key="admin.settings.BaseURL"/></td>
+ <td width="55%" class="BlockContent"><html:text
size="31" property="baseUrl" /></td>
+ </tr>
+ <tr>
+ <td class="BlockLabel"><fmt:message
key="admin.settings.AgentMaxQuietTimeAllowed"/></td>
+ <td class="BlockContent">
+ <table width="100%" cellpadding="0"
cellspacing="0" border="0">
+ <tr>
+<logic:messagesPresent property="agentMaxQuietTimeAllowedVal">
+ <td class="ErrorField">
+ <html:text size="2"
property="agentMaxQuietTimeAllowedVal" />
+ </td>
+ <td class="ErrorField" width="100%">
+ <html:select property="agentMaxQuietTimeAllowed">
+ <html:option value="${CONST_MINUTES}"><fmt:message
key="admin.settings.Minutes"/></html:option>
+ </html:select>
+ </td>
+</logic:messagesPresent>
+<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal">
+ <td class="BlockContent">
+ <html:text size="2"
property="agentMaxQuietTimeAllowedVal" />
+ </td>
+ <td class="BlockContent" width="100%">
+ <html:select property="agentMaxQuietTimeAllowed">
+ <html:option value="${CONST_MINUTES}"><fmt:message
key="admin.settings.Minutes"/></html:option>
+ </html:select>
+ </td>
+</logic:messagesNotPresent>
+ </tr>
+<logic:messagesPresent property="agentMaxQuietTimeAllowedVal">
+ <tr>
+ <td class="ErrorField" colspan="2">
+ <span class="ErrorFieldContent"> <html:errors
property="agentMaxQuietTimeAllowedVal"/></span>
+ </td>
+ </tr>
+</logic:messagesPresent>
+<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal">
+ <tr>
+ <td class="BlockContent" colspan="2">
+ </td>
+ </tr>
+</logic:messagesNotPresent>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="BlockLabel"><fmt:message
key="admin.settings.EnableAgentAutoUpdate"/></td>
+ <td class="BlockContent">
+ <table cellpadding="0" cellspacing="4"
border="0">
+ <tr>
+ <td align="left"><html:radio
property="enableAgentAutoUpdate" value="true"/><fmt:message
key="yesno.true"/></td>
+ <td align="left"><html:radio
property="enableAgentAutoUpdate" value="false"/><fmt:message
key="yesno.false"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+<hq:authorization permission="superuser">
+ <tr>
+ <td class="BlockLabel"><fmt:message
key="admin.settings.EnableDebugMode"/></td>
+ <td class="BlockContent">
+ <table cellpadding="0" cellspacing="4"
border="0">
+ <tr>
+ <td align="left"><html:radio
property="enableDebugMode" value="true"/><fmt:message
key="yesno.true"/></td>
+ <td align="left"><html:radio
property="enableDebugMode" value="false"/><fmt:message
key="yesno.false"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</hq:authorization>
+
+<fmt:message var="productName" key="product.shortName" />
+<c:if test="${productName eq 'RHQ'}">
+<hq:authorization permission="superuser">
+ <tr>
+ <td class="BlockLabel"><fmt:message
key="admin.settings.EnableExperimentalFeatures"/></td>
+ <td class="BlockContent">
+ <table cellpadding="0" cellspacing="4"
border="0">
+ <tr>
+ <td align="left"><html:radio
property="enableExperimentalFeatures" value="true"/><fmt:message
key="yesno.true"/></td>
+ <td align="left"><html:radio
property="enableExperimentalFeatures"
value="false"/><fmt:message key="yesno.false"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</hq:authorization>
+</c:if>
+
+</table>