publish_release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit e2c5380318047627b1d6993dc74e1c9900754ae6 Merge: 1d6a2a8 e512102 Author: John Sanda jsanda@redhat.com Date: Fri Apr 29 12:39:30 2011 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 1d6a2a898ee925a35d6160e61a2095dbd37476f5 Author: John Sanda jsanda@redhat.com Date: Fri Apr 29 11:03:38 2011 -0400
Uncomment if block to allow maven to deploy artifacts
diff --git a/publish_release.sh b/publish_release.sh index 534de03..3e5b0c4 100755 --- a/publish_release.sh +++ b/publish_release.sh @@ -196,11 +196,11 @@ 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 +if [ "$MODE" = "production" ] && [ "$RELEASE_TYPE" = "community" ]; then + MAVEN_RELEASE_PERFORM_GOAL="deploy" +else MAVEN_RELEASE_PERFORM_GOAL="install" -#fi +fi
# Set the system character encoding to ISO-8859-1 to ensure i18log reads its
commit 1c2ebdc48061732d8da6c6c1ac842d9ac0fa7ca2 Author: Ian Springer ian.springer@redhat.com Date: Fri Apr 29 10:56:39 2011 -0400
by default, GWT-compile support for both the "en" and "de" locales (cherry picked from commit e5121025d6c9c0588c28d31b84713e8e43955948)
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 7cff82b..b93f878 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -1,4 +1,5 @@ -<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"> +<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%22%3E
<modelVersion>4.0.0</modelVersion>
@@ -62,9 +63,9 @@ up gwt compilation. --> <gwt.draftCompile>false</gwt.draftCompile>
- <!-- Set the default locale for the GUI. Currently supported locales are "default" (for English) or "de" (for - German). --> - <gwt.locale>default</gwt.locale> + <!-- Comma-separated list of the locales that should be included during GWT compilation. Currently supported + locales (i.e. locales for which we have localized message bundles) are "en" and "de". --> + <gwt.locale>en,de</gwt.locale> </properties>
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index a7b603d..f63dbd9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -1,5 +1,5 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0//EN" - "http://google-web-toolkit.googlecode.com/svn/releases/2.0/distro-source/core/src/gwt-module.dtd"> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.4//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/2.0.4/distro-source/core/src/gwt-module.dtd">
<module>
@@ -89,17 +89,28 @@ The gwt.userAgent property is substituted by the Maven resources plugin during the resources phase. The default value (defined in coregui/pom.xml) is "ie6,ie8,gecko1_8,safari,opera" (i.e. all supported browsers, except FF1). - To override this value, specify the user.agent property on the mvn - command line (e.g. -Duser.agent=gecko1_8) or in your ~/.m2/settings.xml. + To override this value, specify the gwt.userAgent property on the mvn + command line (e.g. -Dgwt.userAgent=gecko1_8) or in your ~/.m2/settings.xml. --> <set-property name="user.agent" value="${gwt.userAgent}"/>
- <!-- Support for locales ('en' need not be specified as long as @DefaultLocale annotates - the Constants, ConstantsWithLookup, and Messages class). Note, these other locales - must have a file suffixed with _<locale>.properties in the same package/directory as - the corresponding GWT i18n interface class resides.--> - <!--<extend-property name="locale" values="de,fr"/>--> + <!-- + A comma-separated list of the supported locales. + + Each of the locales, aside from the default locale (en) must have a message + bundle properties file suffixed with _<locale>.properties in the same package + in which the corresponding GWT i18n interface class resides. + + The gwt.locale property is substituted by the Maven resources plugin + during the resources phase. The default value (defined in coregui/pom.xml) + is "en,de", which are the languages for which we currently have localized + messages. To override this value, specify the gwt.locale property on the + mvn command line (e.g. -Dgwt.locale=en) or in your ~/.m2/settings.xml. + --> <extend-property name="locale" values="${gwt.locale}" /> + <!-- If the user's locale is not supported, fallback to "en", rather than the "default" locale. --> + <!-- TODO (ips, 04/29/11): Uncomment the below line once we upgrade to GWT 2.1 or later. --> + <!--<set-property-fallback name="locale" value="en"/>-->
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/> <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/>
commit aa71bbe4968a3289b5d41d4a2357330deae02182 Author: John Sanda jsanda@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 9995bc6ee8b1355d543ea986f222f8477e57b321 Author: John Sanda jsanda@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"