Skip to content
This repository
Browse code

fix for Bug 6908, fixed up messages to make the situation clearer

  • Loading branch information...
commit d29f48f5a34ac498a6af6a55afc3b4a6e752f56a 1 parent c879115
Tim Freeman authored March 24, 2010
4  cloud-client/builder/environment.sh
@@ -2,7 +2,7 @@ if [ ! "X$CLCLBUILDER_ENVIRONMENT_DEFINED" = "X" ]; then
2 2
   return 0
3 3
 fi
4 4
 
5  
-export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-014"
  5
+export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-015"
6 6
 
7 7
 # #########################################################
8 8
 
@@ -33,7 +33,7 @@ export GLOBUS_LOCATION="$CLCLBUILDER_DIST_DIRECTORY/lib/globus"
33 33
 
34 34
 # #########################################################
35 35
 
36  
-export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../bin/clients-only-build-and-install.sh"
  36
+export NIMBUS_CLIENT_INSTALL_SCRIPT="$CLCLBUILDER_BASEDIR/../scripts/clients-only-build-and-install.sh"
37 37
 
38 38
 # #########################################################
39 39
 
1  service/client/java/source/src/org/globus/workspace/client_core/print/PrCodes.java
@@ -195,6 +195,7 @@ public static void main(String[] args) {
195 195
 
196 196
     public static final int LISTENER_AUTODESTROY = 5005;
197 197
     public static final int LISTENER_AUTODESTROY__ERRORS = 5006;
  198
+	public static final int LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE = 5007;
198 199
 
199 200
     public static final int LISTENER_LOGISTICSQUERY__ERRORS = 5012;
200 201
 
16  .../client/java/source/src/org/globus/workspace/client_core/subscribe_tools/TaskfulStateChangeListener.java
@@ -245,8 +245,20 @@ static void destroy(Workspace workspace,
245 245
             final String err = "\"" + workspace.getDisplayName() + "\": " +
246 246
                     newState.getState() + ", calling destroy for you.";
247 247
             if (print.useThis()) {
248  
-                print.errln(PrCodes.LISTENER_AUTODESTROY,
249  
-                              err);
  248
+
  249
+				// Uncleanly injecting cloud-client message here.
  250
+				// And also uncleanly consulting the 'PrintOpts' internals.  Bravo.
  251
+				if (print.getOpts().printThis(PrCodes.LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE)) {
  252
+					if (newState.getState().equals(State.STATE_TransportReady)) {
  253
+						print.errln(PrCodes.LISTENER_AUTODESTROY_CLOUD_UNPROPAGATE,
  254
+									"The image has successfully been transferred to your " +
  255
+											"repository directory.\n\nFinalizing the " +
  256
+											"deployment now (terminating the resource " +
  257
+											"lease).\n");
  258
+					}
  259
+				} else {
  260
+                	print.errln(PrCodes.LISTENER_AUTODESTROY, err);
  261
+				}
250 262
             } else if (print.useLogging()) {
251 263
                 logger.error(err);
252 264
             }
2  service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java
@@ -147,6 +147,8 @@ public CloudClient(Print pr) {
147 147
                                 PrCodes.CREATE__EXTRALINES,
148 148
                                 PrCodes.MD_SSH__FILE_READ,
149 149
                                 PrCodes.MD_USERDATA__FILE_READ,
  150
+								PrCodes.LISTENER_TERMINATION__INSTANCE_ID_PRINT,
  151
+								PrCodes.LISTENER_AUTODESTROY,
150 152
                                 PrCodes.CREATE__CTXBROKER_CONTACTINF};
151 153
         return PrCodes.getAllCodesExcept(optOuts);
152 154
     }
2  service/client/java/source/src/org/globus/workspace/common/print/PrintOpts.java
@@ -138,7 +138,7 @@ boolean isPrintAll() {
138 138
         return this.printAll;
139 139
     }
140 140
 
141  
-    boolean printThis(int code) {
  141
+    public boolean printThis(int code) {
142 142
         if (this.disableEntirely) {
143 143
             return false;
144 144
         }

0 notes on commit d29f48f

Please sign in to comment.
Something went wrong with that request. Please try again.