Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
4 cloud-client/builder/environment.sh
@@ -2,7 +2,7 @@ if [ ! "X$CLCLBUILDER_ENVIRONMENT_DEFINED" = "X" ]; then
return 0
fi
-export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-014"
+export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-015"
# #########################################################
@@ -33,7 +33,7 @@ export GLOBUS_LOCATION="$CLCLBUILDER_DIST_DIRECTORY/lib/globus"
# #########################################################
-export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../bin/clients-only-build-and-install.sh"
+export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/clients-only-build-and-install.sh"
# #########################################################
View
1  service/client/java/source/src/org/globus/workspace/client_core/print/PrCodes.java
@@ -195,6 +195,7 @@ public static void main(String[] args) {
public static final int LISTENER_AUTODESTROY = 5005;
public static final int LISTENER_AUTODESTROY__ERRORS = 5006;
+ public static final int LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE = 5007;
public static final int LISTENER_LOGISTICSQUERY__ERRORS = 5012;
View
16 .../client/java/source/src/org/globus/workspace/client_core/subscribe_tools/TaskfulStateChangeListener.java
@@ -245,8 +245,20 @@ static void destroy(Workspace workspace,
final String err = "\"" + workspace.getDisplayName() + "\": " +
newState.getState() + ", calling destroy for you.";
if (print.useThis()) {
- print.errln(PrCodes.LISTENER_AUTODESTROY,
- err);
+
+ // Uncleanly injecting cloud-client message here.
+ // And also uncleanly consulting the 'PrintOpts' internals. Bravo.
+ if (print.getOpts().printThis(PrCodes.LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE)) {
+ if (newState.getState().equals(State.STATE_TransportReady)) {
+ print.errln(PrCodes.LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE,
+ "The image has successfully been transferred to your " +
+ "repository directory.\n\nFinalizing the " +
+ "deployment now (terminating the resource " +
+ "lease).\n");
+ }
+ } else {
+ print.errln(PrCodes.LISTENER_AUTODESTROY, err);
+ }
} else if (print.useLogging()) {
logger.error(err);
}
View
2  service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java
@@ -147,6 +147,8 @@ public CloudClient(Print pr) {
PrCodes.CREATE__EXTRALINES,
PrCodes.MD_SSH__FILE_READ,
PrCodes.MD_USERDATA__FILE_READ,
+ PrCodes.LISTENER_TERMINATION__INSTANCE_ID_PRINT,
+ PrCodes.LISTENER_AUTODESTROY,
PrCodes.CREATE__CTXBROKER_CONTACTINF};
return PrCodes.getAllCodesExcept(optOuts);
}
View
2  service/client/java/source/src/org/globus/workspace/common/print/PrintOpts.java
@@ -138,7 +138,7 @@ boolean isPrintAll() {
return this.printAll;
}
- boolean printThis(int code) {
+ public boolean printThis(int code) {
if (this.disableEntirely) {
return false;
}

No commit comments for this range

Something went wrong with that request. Please try again.