From a6a864a1a88a1b0959ef82b37874c2bbb6a2a2bf Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@citrix.com>
Date: Tue, 7 Aug 2012 15:38:59 -0700
Subject: [PATCH] Removed Base64 file and use the apache version

---
 awsapi/.classpath                             |   18 -
 build/developer.xml                           |    2 +-
 server/src/com/cloud/api/ApiServer.java       |  126 +-
 .../cloud/servlet/ConsoleProxyServlet.java    |  788 ++---
 .../cloud/sample/UserCloudAPIExecutor.java    |    3 +-
 .../test/stress/StressTestDirectAttach.java   | 2630 ++++++++---------
 .../cloud/test/stress/TestClientWithAPI.java  |   64 +-
 .../com/cloud/test/utils/UtilsForTest.java    |  384 +--
 .../src/com/cloud/utils/encoding/Base64.java  | 1739 -----------
 9 files changed, 1998 insertions(+), 3756 deletions(-)
 delete mode 100755 utils/src/com/cloud/utils/encoding/Base64.java

diff --git a/awsapi/.classpath b/awsapi/.classpath
index 4dc46c4b1ec..03d1a1fc3e9 100644
--- a/awsapi/.classpath
+++ b/awsapi/.classpath
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
diff --git a/build/developer.xml b/build/developer.xml
index 2d5f2db5dcc..d52b6823758 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -241,7 +241,7 @@
     	<available file="${setup.db.dir}/override/templates.sql" />
     </condition>
   	
-    <echo message="deploydb ${server-setup.file} ${templates.file} ${DBROOTPW}" />
+    <echo message="${db.scripts.dir}\\deploy-db-dev.sh ${server-setup.file} ${templates.file} ${DBROOTPW}" />
     <exec dir="${db.scripts.dir}" executable="bash" failonerror="true">
       <arg value="deploy-db-dev.sh" />
       <arg value="${server-setup.file}" />
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 5466e23c44b..4cb3c6fa845 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -53,6 +53,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
@@ -112,7 +113,6 @@ import com.cloud.utils.component.PluggableService;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.Transaction;
-import com.cloud.utils.encoding.Base64;
 import com.cloud.utils.exception.CSExceptionErrorCode;
 import com.cloud.uuididentity.dao.IdentityDao;
 
@@ -432,31 +432,31 @@ public class ApiServer implements HttpRequestHandler {
             }
         } catch (Exception ex) {
             if (ex instanceof InvalidParameterValueException) {
-            	InvalidParameterValueException ref = (InvalidParameterValueException)ex;
-            	ServerApiException e = new ServerApiException(BaseCmd.PARAM_ERROR, ex.getMessage());            	
+                InvalidParameterValueException ref = (InvalidParameterValueException)ex;
+                ServerApiException e = new ServerApiException(BaseCmd.PARAM_ERROR, ex.getMessage());            	
                 // copy over the IdentityProxy information as well and throw the serverapiexception.
                 ArrayList<IdentityProxy> idList = ref.getIdProxyList();
                 if (idList != null) {
-                	// Iterate through entire arraylist and copy over each proxy id.
-                	for (int i = 0 ; i < idList.size(); i++) {
-                		IdentityProxy obj = idList.get(i);
-                		e.addProxyObject(obj.getTableName(), obj.getValue(), obj.getidFieldName());
-                	}
+                    // Iterate through entire arraylist and copy over each proxy id.
+                    for (int i = 0 ; i < idList.size(); i++) {
+                        IdentityProxy obj = idList.get(i);
+                        e.addProxyObject(obj.getTableName(), obj.getValue(), obj.getidFieldName());
+                    }
                 }
                 // Also copy over the cserror code and the function/layer in which it was thrown.
-            	e.setCSErrorCode(ref.getCSErrorCode());
+                e.setCSErrorCode(ref.getCSErrorCode());
                 throw e;
             } else if (ex instanceof PermissionDeniedException) {
-            	PermissionDeniedException ref = (PermissionDeniedException)ex;
-            	ServerApiException e = new ServerApiException(BaseCmd.ACCOUNT_ERROR, ex.getMessage());
+                PermissionDeniedException ref = (PermissionDeniedException)ex;
+                ServerApiException e = new ServerApiException(BaseCmd.ACCOUNT_ERROR, ex.getMessage());
                 // copy over the IdentityProxy information as well and throw the serverapiexception.
-            	ArrayList<IdentityProxy> idList = ref.getIdProxyList();
+                ArrayList<IdentityProxy> idList = ref.getIdProxyList();
                 if (idList != null) {
-                	// Iterate through entire arraylist and copy over each proxy id.
-                	for (int i = 0 ; i < idList.size(); i++) {
-                		IdentityProxy obj = idList.get(i);
-                		e.addProxyObject(obj.getTableName(), obj.getValue(), obj.getidFieldName());
-                	}
+                    // Iterate through entire arraylist and copy over each proxy id.
+                    for (int i = 0 ; i < idList.size(); i++) {
+                        IdentityProxy obj = idList.get(i);
+                        e.addProxyObject(obj.getTableName(), obj.getValue(), obj.getidFieldName());
+                    }
                 }
                 e.setCSErrorCode(ref.getCSErrorCode());
                 throw e;
@@ -751,7 +751,7 @@ public class ApiServer implements HttpRequestHandler {
             mac.init(keySpec);
             mac.update(unsignedRequest.getBytes());
             byte[] encryptedBytes = mac.doFinal();
-            String computedSignature = Base64.encodeBytes(encryptedBytes);
+            String computedSignature = Base64.encodeBase64URLSafeString(encryptedBytes);
             boolean equalSig = signature.equals(computedSignature);
             if (!equalSig) {
                 s_logger.info("User signature: " + signature + " is not equaled to computed signature: " + computedSignature);
@@ -765,7 +765,7 @@ public class ApiServer implements HttpRequestHandler {
         }
         return false;
     }
-    
+
     public Long fetchDomainId(String domainUUID){
         ComponentLocator locator = ComponentLocator.getLocator(ManagementServer.Name);
         IdentityDao identityDao = locator.getDao(IdentityDao.class);
@@ -816,19 +816,19 @@ public class ApiServer implements HttpRequestHandler {
             if(user.getUuid() != null){
                 session.setAttribute("user_UUID", user.getUuid());
             }
-            
+
             session.setAttribute("username", userAcct.getUsername());
             session.setAttribute("firstname", userAcct.getFirstname());
             session.setAttribute("lastname", userAcct.getLastname());
             session.setAttribute("accountobj", account);
             session.setAttribute("account", account.getAccountName());
-            
+
             session.setAttribute("domainid", account.getDomainId());
             DomainVO domain = (DomainVO) _domainMgr.getDomain(account.getDomainId());
             if(domain.getUuid() != null){
                 session.setAttribute("domain_UUID", domain.getUuid());
             }
-            
+
             session.setAttribute("type", Short.valueOf(account.getType()).toString());
             session.setAttribute("registrationtoken", userAcct.getRegistrationToken());
             session.setAttribute("registered", new Boolean(userAcct.isRegistered()).toString());
@@ -843,7 +843,7 @@ public class ApiServer implements HttpRequestHandler {
             SecureRandom sesssionKeyRandom = new SecureRandom();
             byte sessionKeyBytes[] = new byte[20];
             sesssionKeyRandom.nextBytes(sessionKeyBytes);
-            String sessionKey = Base64.encodeBytes(sessionKeyBytes);
+            String sessionKey = Base64.encodeBase64URLSafeString(sessionKeyBytes);
             session.setAttribute("sessionkey", sessionKey);
 
             return;
@@ -938,8 +938,8 @@ public class ApiServer implements HttpRequestHandler {
 
             _params = new BasicHttpParams();
             _params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 30000).setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
-                    .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false).setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
-                    .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
+            .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false).setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
+            .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
 
             // Set up the HTTP protocol processor
             BasicHttpProcessor httpproc = new BasicHttpProcessor();
@@ -1053,44 +1053,44 @@ public class ApiServer implements HttpRequestHandler {
             // Exception. When invoked from ApiServlet's processRequest(), this can be
             // a standard exception like NumberFormatException. We'll leave the standard ones alone.
             if (ex != null) {
-            	if (ex instanceof ServerApiException || ex instanceof PermissionDeniedException
-            			|| ex instanceof InvalidParameterValueException) {
-            		// Cast the exception appropriately and retrieve the IdentityProxy
-            		if (ex instanceof ServerApiException) {
-            			ServerApiException ref = (ServerApiException) ex;
-            			ArrayList<IdentityProxy> idList = ref.getIdProxyList();
-            			if (idList != null) {
-            				for (int i=0; i < idList.size(); i++) {
-            					IdentityProxy id = idList.get(i);
-            					apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
-            				}            				
-            			}
-            			// Also copy over the cserror code and the function/layer in which it was thrown.
-            			apiResponse.setCSErrorCode(ref.getCSErrorCode());
-            		} else if (ex instanceof PermissionDeniedException) {
-            			PermissionDeniedException ref = (PermissionDeniedException) ex;
-            			ArrayList<IdentityProxy> idList = ref.getIdProxyList();
-            			if (idList != null) {
-            				for (int i=0; i < idList.size(); i++) {
-            					IdentityProxy id = idList.get(i);
-            					apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
-            				}            				
-            			}
-            			// Also copy over the cserror code and the function/layer in which it was thrown.
-            			apiResponse.setCSErrorCode(ref.getCSErrorCode());
-            		} else if (ex instanceof InvalidParameterValueException) {
-            			InvalidParameterValueException ref = (InvalidParameterValueException) ex;
-            			ArrayList<IdentityProxy> idList = ref.getIdProxyList();
-            			if (idList != null) {
-            				for (int i=0; i < idList.size(); i++) {
-            					IdentityProxy id = idList.get(i);
-            					apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
-            				}            				
-            			}
-            			// Also copy over the cserror code and the function/layer in which it was thrown.
-            			apiResponse.setCSErrorCode(ref.getCSErrorCode());
-            		}
-            	}
+                if (ex instanceof ServerApiException || ex instanceof PermissionDeniedException
+                        || ex instanceof InvalidParameterValueException) {
+                    // Cast the exception appropriately and retrieve the IdentityProxy
+                    if (ex instanceof ServerApiException) {
+                        ServerApiException ref = (ServerApiException) ex;
+                        ArrayList<IdentityProxy> idList = ref.getIdProxyList();
+                        if (idList != null) {
+                            for (int i=0; i < idList.size(); i++) {
+                                IdentityProxy id = idList.get(i);
+                                apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
+                            }            				
+                        }
+                        // Also copy over the cserror code and the function/layer in which it was thrown.
+                        apiResponse.setCSErrorCode(ref.getCSErrorCode());
+                    } else if (ex instanceof PermissionDeniedException) {
+                        PermissionDeniedException ref = (PermissionDeniedException) ex;
+                        ArrayList<IdentityProxy> idList = ref.getIdProxyList();
+                        if (idList != null) {
+                            for (int i=0; i < idList.size(); i++) {
+                                IdentityProxy id = idList.get(i);
+                                apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
+                            }            				
+                        }
+                        // Also copy over the cserror code and the function/layer in which it was thrown.
+                        apiResponse.setCSErrorCode(ref.getCSErrorCode());
+                    } else if (ex instanceof InvalidParameterValueException) {
+                        InvalidParameterValueException ref = (InvalidParameterValueException) ex;
+                        ArrayList<IdentityProxy> idList = ref.getIdProxyList();
+                        if (idList != null) {
+                            for (int i=0; i < idList.size(); i++) {
+                                IdentityProxy id = idList.get(i);
+                                apiResponse.addProxyObject(id.getTableName(), id.getValue(), id.getidFieldName());
+                            }            				
+                        }
+                        // Also copy over the cserror code and the function/layer in which it was thrown.
+                        apiResponse.setCSErrorCode(ref.getCSErrorCode());
+                    }
+                }
             }
             SerializationContext.current().setUuidTranslation(true);
             responseText = ApiResponseSerializer.toSerializedString(apiResponse, responseType);
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 93a401cd125..20faa327fd1 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -58,61 +58,61 @@ import com.cloud.vm.VirtualMachineManager;
  * Authentication : /console?cmd=auth&vm=xxx&sid=xxx
  */
 public class ConsoleProxyServlet extends HttpServlet {
-	private static final long serialVersionUID = -5515382620323808168L;
-	public static final Logger s_logger = Logger.getLogger(ConsoleProxyServlet.class.getName());
-	private static final int DEFAULT_THUMBNAIL_WIDTH = 144;
-	private static final int DEFAULT_THUMBNAIL_HEIGHT = 110;
-	
-	private final static AccountManager _accountMgr = ComponentLocator.getLocator(ManagementServer.Name).getManager(AccountManager.class);
-	private final static VirtualMachineManager _vmMgr = ComponentLocator.getLocator(ManagementServer.Name).getManager(VirtualMachineManager.class);
-	private final static ManagementServer _ms = (ManagementServer)ComponentLocator.getComponent(ManagementServer.Name);
-	private final static IdentityService _identityService = (IdentityService)ComponentLocator.getLocator(ManagementServer.Name).getManager(IdentityService.class); 
-	
-	@Override
+    private static final long serialVersionUID = -5515382620323808168L;
+    public static final Logger s_logger = Logger.getLogger(ConsoleProxyServlet.class.getName());
+    private static final int DEFAULT_THUMBNAIL_WIDTH = 144;
+    private static final int DEFAULT_THUMBNAIL_HEIGHT = 110;
+
+    private final static AccountManager _accountMgr = ComponentLocator.getLocator(ManagementServer.Name).getManager(AccountManager.class);
+    private final static VirtualMachineManager _vmMgr = ComponentLocator.getLocator(ManagementServer.Name).getManager(VirtualMachineManager.class);
+    private final static ManagementServer _ms = (ManagementServer)ComponentLocator.getComponent(ManagementServer.Name);
+    private final static IdentityService _identityService = ComponentLocator.getLocator(ManagementServer.Name).getManager(IdentityService.class); 
+
+    @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
-		doGet(req, resp);
-	}
-	
-	@Override
+        doGet(req, resp);
+    }
+
+    @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
-		
-		try {
-			if(_accountMgr == null || _vmMgr == null || _ms == null) {
-				sendResponse(resp, "Service is not ready");
-				return;
-			}
-			
-			if(_ms.getHashKey() == null) {
-	        	s_logger.debug("Console/thumbnail access denied. Ticket service is not ready yet");
-				sendResponse(resp, "Service is not ready");
-	        	return;
-			}
-				
+
+        try {
+            if(_accountMgr == null || _vmMgr == null || _ms == null) {
+                sendResponse(resp, "Service is not ready");
+                return;
+            }
+
+            if(_ms.getHashKey() == null) {
+                s_logger.debug("Console/thumbnail access denied. Ticket service is not ready yet");
+                sendResponse(resp, "Service is not ready");
+                return;
+            }
+
             String userId = null;
             String account = null;
             Account accountObj = null;
-            
+
             Map<String, Object[]> params = new HashMap<String, Object[]>();
             params.putAll(req.getParameterMap());
 
             HttpSession session = req.getSession(false);
             if(session == null) {
-            	if(verifyRequest(params)) {
+                if(verifyRequest(params)) {
                     userId = (String)params.get("userid")[0];
                     account = (String)params.get("account")[0];
                     accountObj = (Account)params.get("accountobj")[0];
-            	} else {
-					s_logger.debug("Invalid web session or API key in request, reject console/thumbnail access");
-					sendResponse(resp, "Access denied. Invalid web session or API key in request");
-					return;
-            	}
+                } else {
+                    s_logger.debug("Invalid web session or API key in request, reject console/thumbnail access");
+                    sendResponse(resp, "Access denied. Invalid web session or API key in request");
+                    return;
+                }
             } else {
-            	// adjust to latest API refactoring changes
-            	if(session.getAttribute("userid") != null) {
+                // adjust to latest API refactoring changes
+                if(session.getAttribute("userid") != null) {
                     userId = ((Long)session.getAttribute("userid")).toString();
                 }
-                
-            	accountObj = (Account)session.getAttribute("accountobj");
+
+                accountObj = (Account)session.getAttribute("accountobj");
                 if(accountObj != null) {
                     account = "" + accountObj.getId();
                 }
@@ -120,381 +120,381 @@ public class ConsoleProxyServlet extends HttpServlet {
 
             // Do a sanity check here to make sure the user hasn't already been deleted
             if ((userId == null) || (account == null) || (accountObj == null) || !verifyUser(Long.valueOf(userId))) {
-				s_logger.debug("Invalid user/account, reject console/thumbnail access");
-				sendResponse(resp, "Access denied. Invalid or inconsistent account is found");
-				return;
+                s_logger.debug("Invalid user/account, reject console/thumbnail access");
+                sendResponse(resp, "Access denied. Invalid or inconsistent account is found");
+                return;
             }
 
-			String cmd = req.getParameter("cmd");
-			if(cmd == null || !isValidCmd(cmd)) {
-				s_logger.debug("invalid console servlet command: " + cmd);
-				sendResponse(resp, "");
-				return;
-			}
+            String cmd = req.getParameter("cmd");
+            if(cmd == null || !isValidCmd(cmd)) {
+                s_logger.debug("invalid console servlet command: " + cmd);
+                sendResponse(resp, "");
+                return;
+            }
 
-			String vmIdString = req.getParameter("vm");
-			Long vmId = _identityService.getIdentityId("vm_instance", vmIdString);
-			if(vmId == null) {
-				s_logger.info("invalid console servlet command parameter: " + vmIdString);
-				sendResponse(resp, "");
-				return;
-			}
-			
-			if(!checkSessionPermision(req, vmId, accountObj)) {
-				sendResponse(resp, "Permission denied");
-				return;
-			}
-			
-			if(cmd.equalsIgnoreCase("thumbnail")) {
+            String vmIdString = req.getParameter("vm");
+            Long vmId = _identityService.getIdentityId("vm_instance", vmIdString);
+            if(vmId == null) {
+                s_logger.info("invalid console servlet command parameter: " + vmIdString);
+                sendResponse(resp, "");
+                return;
+            }
+
+            if(!checkSessionPermision(req, vmId, accountObj)) {
+                sendResponse(resp, "Permission denied");
+                return;
+            }
+
+            if(cmd.equalsIgnoreCase("thumbnail")) {
                 handleThumbnailRequest(req, resp, vmId);
             } else if(cmd.equalsIgnoreCase("access")) {
                 handleAccessRequest(req, resp, vmId);
             } else {
                 handleAuthRequest(req, resp, vmId);
             }
-		} catch (Throwable e) {
-			s_logger.error("Unexepected exception in ConsoleProxyServlet", e);
-			sendResponse(resp, "Server Internal Error");
-		}
-	}
-	
-	private void handleThumbnailRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
-		VMInstanceVO vm = _vmMgr.findById(vmId);
-		if(vm == null) {
-			s_logger.warn("VM " + vmId + " does not exist, sending blank response for thumbnail request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		if(vm.getHostId() == null) {
-			s_logger.warn("VM " + vmId + " lost host info, sending blank response for thumbnail request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		HostVO host = _ms.getHostBy(vm.getHostId());
-		if(host == null) {
-			s_logger.warn("VM " + vmId + "'s host does not exist, sending blank response for thumbnail request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		String rootUrl = _ms.getConsoleAccessUrlRoot(vmId);
-		if(rootUrl == null) {
-			sendResponse(resp, "");
-			return;
-		}
-		
-		int w = DEFAULT_THUMBNAIL_WIDTH;
-		int h = DEFAULT_THUMBNAIL_HEIGHT;
-		
-		String value = req.getParameter("w");
-		try {
-			w = Integer.parseInt(value);
-		} catch(NumberFormatException e) {
-		}
-		
-		value = req.getParameter("h");
-		try {
-			h = Integer.parseInt(value);
-		} catch(NumberFormatException e) {
-		}
-		
-		try {
-			resp.sendRedirect(composeThumbnailUrl(rootUrl, vm, host, w, h));
-		} catch (IOException e) {
-			if(s_logger.isInfoEnabled()) {
+        } catch (Throwable e) {
+            s_logger.error("Unexepected exception in ConsoleProxyServlet", e);
+            sendResponse(resp, "Server Internal Error");
+        }
+    }
+
+    private void handleThumbnailRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
+        VMInstanceVO vm = _vmMgr.findById(vmId);
+        if(vm == null) {
+            s_logger.warn("VM " + vmId + " does not exist, sending blank response for thumbnail request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        if(vm.getHostId() == null) {
+            s_logger.warn("VM " + vmId + " lost host info, sending blank response for thumbnail request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        HostVO host = _ms.getHostBy(vm.getHostId());
+        if(host == null) {
+            s_logger.warn("VM " + vmId + "'s host does not exist, sending blank response for thumbnail request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        String rootUrl = _ms.getConsoleAccessUrlRoot(vmId);
+        if(rootUrl == null) {
+            sendResponse(resp, "");
+            return;
+        }
+
+        int w = DEFAULT_THUMBNAIL_WIDTH;
+        int h = DEFAULT_THUMBNAIL_HEIGHT;
+
+        String value = req.getParameter("w");
+        try {
+            w = Integer.parseInt(value);
+        } catch(NumberFormatException e) {
+        }
+
+        value = req.getParameter("h");
+        try {
+            h = Integer.parseInt(value);
+        } catch(NumberFormatException e) {
+        }
+
+        try {
+            resp.sendRedirect(composeThumbnailUrl(rootUrl, vm, host, w, h));
+        } catch (IOException e) {
+            if(s_logger.isInfoEnabled()) {
                 s_logger.info("Client may already close the connection");
             }
-		}
-	}
-	
-	private void handleAccessRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
-		VMInstanceVO vm = _vmMgr.findById(vmId);
-		if(vm == null) {
-			s_logger.warn("VM " + vmId + " does not exist, sending blank response for console access request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		if(vm.getHostId() == null) {
-			s_logger.warn("VM " + vmId + " lost host info, sending blank response for console access request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		HostVO host = _ms.getHostBy(vm.getHostId());
-		if(host == null) {
-			s_logger.warn("VM " + vmId + "'s host does not exist, sending blank response for console access request");
-			sendResponse(resp, "");
-			return;
-		}
-		
-		String rootUrl = _ms.getConsoleAccessUrlRoot(vmId);
-		if(rootUrl == null) {
-			sendResponse(resp, "<html><body><p>Console access will be ready in a few minutes. Please try it again later.</p></body></html>");
-			return;
-		}
-		
-		String vmName = vm.getHostName();
-		if(vm.getType() == VirtualMachine.Type.User) {
-			UserVm userVm = (UserVm)_vmMgr.findByIdAndType(VirtualMachine.Type.User, vmId);
-			String displayName = userVm.getDisplayName();
-			if(displayName != null && !displayName.isEmpty() && !displayName.equals(vmName)) {
-	            vmName += "(" + displayName + ")";
-	        }
-		}
-		
-		StringBuffer sb = new StringBuffer();
-		sb.append("<html><title>").append(escapeHTML(vmName)).append("</title><frameset><frame src=\"").append(composeConsoleAccessUrl(rootUrl, vm, host));
-		sb.append("\"></frame></frameset></html>");
-		s_logger.debug("the console url is :: " + sb.toString());
-		sendResponse(resp, sb.toString());
-	}
-	
-	private void handleAuthRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
-		
-		// TODO authentication channel between console proxy VM and management server needs to be secured, 
-		// the data is now being sent through private network, but this is apparently not enough
-		VMInstanceVO vm = _vmMgr.findById(vmId);
-		if(vm == null) {
-			s_logger.warn("VM " + vmId + " does not exist, sending failed response for authentication request from console proxy");
-			sendResponse(resp, "failed");
-			return;
-		}
-		
-		if(vm.getHostId() == null) {
-			s_logger.warn("VM " + vmId + " lost host info, failed response for authentication request from console proxy");
-			sendResponse(resp, "failed");
-			return;
-		}
-		
-		HostVO host = _ms.getHostBy(vm.getHostId());
-		if(host == null) {
-			s_logger.warn("VM " + vmId + "'s host does not exist, sending failed response for authentication request from console proxy");
-			sendResponse(resp, "failed");
-			return;
-		}
-		
-		String sid = req.getParameter("sid");
-		if(sid == null || !sid.equals(vm.getVncPassword())) {
-			s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword());
-			sendResponse(resp, "failed");
-			return;
-		}
-		
-		sendResponse(resp, "success");
-	}
-	
-	// put the ugly stuff here
-	static public Ternary<String, String, String> parseHostInfo(String hostInfo) {
-		String host = null;
-		String tunnelUrl = null;
-		String tunnelSession = null;
-		
-		s_logger.info("Parse host info returned from executing GetVNCPortCommand. host info: " + hostInfo);
-		
-        if(hostInfo != null && hostInfo.startsWith("consoleurl")) {
-        	String tokens[] = hostInfo.split("&");
-        	
-        	if(hostInfo.length() > 19 && hostInfo.indexOf('/', 19) > 19) {
-	        	host = hostInfo.substring(19, hostInfo.indexOf('/', 19)).trim();
-	        	tunnelUrl = tokens[0].substring("consoleurl=".length());
-	        	tunnelSession = tokens[1].split("=")[1];
-        	} else {
-        		host = "";
-        	}
-        } else {
-        	host = hostInfo;
         }
-        
+    }
+
+    private void handleAccessRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
+        VMInstanceVO vm = _vmMgr.findById(vmId);
+        if(vm == null) {
+            s_logger.warn("VM " + vmId + " does not exist, sending blank response for console access request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        if(vm.getHostId() == null) {
+            s_logger.warn("VM " + vmId + " lost host info, sending blank response for console access request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        HostVO host = _ms.getHostBy(vm.getHostId());
+        if(host == null) {
+            s_logger.warn("VM " + vmId + "'s host does not exist, sending blank response for console access request");
+            sendResponse(resp, "");
+            return;
+        }
+
+        String rootUrl = _ms.getConsoleAccessUrlRoot(vmId);
+        if(rootUrl == null) {
+            sendResponse(resp, "<html><body><p>Console access will be ready in a few minutes. Please try it again later.</p></body></html>");
+            return;
+        }
+
+        String vmName = vm.getHostName();
+        if(vm.getType() == VirtualMachine.Type.User) {
+            UserVm userVm = (UserVm)_vmMgr.findByIdAndType(VirtualMachine.Type.User, vmId);
+            String displayName = userVm.getDisplayName();
+            if(displayName != null && !displayName.isEmpty() && !displayName.equals(vmName)) {
+                vmName += "(" + displayName + ")";
+            }
+        }
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("<html><title>").append(escapeHTML(vmName)).append("</title><frameset><frame src=\"").append(composeConsoleAccessUrl(rootUrl, vm, host));
+        sb.append("\"></frame></frameset></html>");
+        s_logger.debug("the console url is :: " + sb.toString());
+        sendResponse(resp, sb.toString());
+    }
+
+    private void handleAuthRequest(HttpServletRequest req, HttpServletResponse resp, long vmId) {
+
+        // TODO authentication channel between console proxy VM and management server needs to be secured, 
+        // the data is now being sent through private network, but this is apparently not enough
+        VMInstanceVO vm = _vmMgr.findById(vmId);
+        if(vm == null) {
+            s_logger.warn("VM " + vmId + " does not exist, sending failed response for authentication request from console proxy");
+            sendResponse(resp, "failed");
+            return;
+        }
+
+        if(vm.getHostId() == null) {
+            s_logger.warn("VM " + vmId + " lost host info, failed response for authentication request from console proxy");
+            sendResponse(resp, "failed");
+            return;
+        }
+
+        HostVO host = _ms.getHostBy(vm.getHostId());
+        if(host == null) {
+            s_logger.warn("VM " + vmId + "'s host does not exist, sending failed response for authentication request from console proxy");
+            sendResponse(resp, "failed");
+            return;
+        }
+
+        String sid = req.getParameter("sid");
+        if(sid == null || !sid.equals(vm.getVncPassword())) {
+            s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword());
+            sendResponse(resp, "failed");
+            return;
+        }
+
+        sendResponse(resp, "success");
+    }
+
+    // put the ugly stuff here
+    static public Ternary<String, String, String> parseHostInfo(String hostInfo) {
+        String host = null;
+        String tunnelUrl = null;
+        String tunnelSession = null;
+
+        s_logger.info("Parse host info returned from executing GetVNCPortCommand. host info: " + hostInfo);
+
+        if(hostInfo != null && hostInfo.startsWith("consoleurl")) {
+            String tokens[] = hostInfo.split("&");
+
+            if(hostInfo.length() > 19 && hostInfo.indexOf('/', 19) > 19) {
+                host = hostInfo.substring(19, hostInfo.indexOf('/', 19)).trim();
+                tunnelUrl = tokens[0].substring("consoleurl=".length());
+                tunnelSession = tokens[1].split("=")[1];
+            } else {
+                host = "";
+            }
+        } else {
+            host = hostInfo;
+        }
+
         return new Ternary<String, String, String>(host, tunnelUrl, tunnelSession);
-	}
-	
-	private String composeThumbnailUrl(String rootUrl, VMInstanceVO vm, HostVO hostVo, int w, int h) {
-		StringBuffer sb = new StringBuffer(rootUrl);
+    }
 
-		String host = hostVo.getPrivateIpAddress();
-		
-		Pair<String, Integer> portInfo = _ms.getVncPort(vm);
-		Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
-		
-		String sid = vm.getVncPassword();
-		String tag = String.valueOf(vm.getId());
-		tag = _identityService.getIdentityUuid("vm_instance", tag);
-		String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
+    private String composeThumbnailUrl(String rootUrl, VMInstanceVO vm, HostVO hostVo, int w, int h) {
+        StringBuffer sb = new StringBuffer(rootUrl);
 
-		ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey());
-		ConsoleProxyClientParam param = new ConsoleProxyClientParam();
-		param.setClientHostAddress(parsedHostInfo.first());
-		param.setClientHostPort(portInfo.second());
-		param.setClientHostPassword(sid);
-		param.setClientTag(tag);
-		param.setTicket(ticket);
-		if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
-			param.setClientTunnelUrl(parsedHostInfo.second());
-			param.setClientTunnelSession(parsedHostInfo.third());
-		}
-		
-		sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
-		sb.append("&w=").append(w).append("&h=").append(h);
-		
-		if(s_logger.isDebugEnabled()) {
+        String host = hostVo.getPrivateIpAddress();
+
+        Pair<String, Integer> portInfo = _ms.getVncPort(vm);
+        Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
+
+        String sid = vm.getVncPassword();
+        String tag = String.valueOf(vm.getId());
+        tag = _identityService.getIdentityUuid("vm_instance", tag);
+        String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
+
+        ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey());
+        ConsoleProxyClientParam param = new ConsoleProxyClientParam();
+        param.setClientHostAddress(parsedHostInfo.first());
+        param.setClientHostPort(portInfo.second());
+        param.setClientHostPassword(sid);
+        param.setClientTag(tag);
+        param.setTicket(ticket);
+        if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
+            param.setClientTunnelUrl(parsedHostInfo.second());
+            param.setClientTunnelSession(parsedHostInfo.third());
+        }
+
+        sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
+        sb.append("&w=").append(w).append("&h=").append(h);
+
+        if(s_logger.isDebugEnabled()) {
             s_logger.debug("Compose thumbnail url: " + sb.toString());
         }
-		return sb.toString();
-	}
-	
-	private String composeConsoleAccessUrl(String rootUrl, VMInstanceVO vm, HostVO hostVo) {
-		StringBuffer sb = new StringBuffer(rootUrl);
-		String host = hostVo.getPrivateIpAddress();
-		
-		Pair<String, Integer> portInfo = _ms.getVncPort(vm);
-		if(s_logger.isDebugEnabled())
-			s_logger.debug("Port info " + portInfo.first());
+        return sb.toString();
+    }
 
-		Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
+    private String composeConsoleAccessUrl(String rootUrl, VMInstanceVO vm, HostVO hostVo) {
+        StringBuffer sb = new StringBuffer(rootUrl);
+        String host = hostVo.getPrivateIpAddress();
 
-		String sid = vm.getVncPassword();
-		String tag = String.valueOf(vm.getId());
-		tag = _identityService.getIdentityUuid("vm_instance", tag);
-		String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
-		ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey());
-		ConsoleProxyClientParam param = new ConsoleProxyClientParam();
-		param.setClientHostAddress(parsedHostInfo.first());
-		param.setClientHostPort(portInfo.second());
-		param.setClientHostPassword(sid);
-		param.setClientTag(tag);
-		param.setTicket(ticket);
-		if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
-			param.setClientTunnelUrl(parsedHostInfo.second());
-			param.setClientTunnelSession(parsedHostInfo.third());
-		}
-		
-		sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
-		
-		// for console access, we need guest OS type to help implement keyboard
-		long guestOs = vm.getGuestOSId();
-		GuestOSVO guestOsVo = _ms.getGuestOs(guestOs);
-		if(guestOsVo.getCategoryId() == 6)
-			sb.append("&guest=windows");
-		
-		if(s_logger.isDebugEnabled()) {
+        Pair<String, Integer> portInfo = _ms.getVncPort(vm);
+        if(s_logger.isDebugEnabled())
+            s_logger.debug("Port info " + portInfo.first());
+
+        Ternary<String, String, String> parsedHostInfo = parseHostInfo(portInfo.first());
+
+        String sid = vm.getVncPassword();
+        String tag = String.valueOf(vm.getId());
+        tag = _identityService.getIdentityUuid("vm_instance", tag);
+        String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
+        ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey());
+        ConsoleProxyClientParam param = new ConsoleProxyClientParam();
+        param.setClientHostAddress(parsedHostInfo.first());
+        param.setClientHostPort(portInfo.second());
+        param.setClientHostPassword(sid);
+        param.setClientTag(tag);
+        param.setTicket(ticket);
+        if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
+            param.setClientTunnelUrl(parsedHostInfo.second());
+            param.setClientTunnelSession(parsedHostInfo.third());
+        }
+
+        sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
+
+        // for console access, we need guest OS type to help implement keyboard
+        long guestOs = vm.getGuestOSId();
+        GuestOSVO guestOsVo = _ms.getGuestOs(guestOs);
+        if(guestOsVo.getCategoryId() == 6)
+            sb.append("&guest=windows");
+
+        if(s_logger.isDebugEnabled()) {
             s_logger.debug("Compose console url: " + sb.toString());
         }
-		return sb.toString();
-	}
-	
-	public static String genAccessTicket(String host, String port, String sid, String tag) {
-		return genAccessTicket(host, port, sid, tag, new Date());
-	}
-	
-	public static String genAccessTicket(String host, String port, String sid, String tag, Date normalizedHashTime) {
-		String params = "host=" + host + "&port=" + port + "&sid=" + sid + "&tag=" + tag;
-		
-		try {
-	        Mac mac = Mac.getInstance("HmacSHA1");
-	        
-	        long ts = normalizedHashTime.getTime();
-	        ts = ts/60000;		// round up to 1 minute
-	        String secretKey = _ms.getHashKey();
-	        
-	        SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), "HmacSHA1");
-	        mac.init(keySpec);
-	        mac.update(params.getBytes());
-	        mac.update(String.valueOf(ts).getBytes());
-	        
-	        byte[] encryptedBytes = mac.doFinal();
-	        
-	        return Base64.encodeBase64URLSafeString(encryptedBytes);
-		} catch(Exception e) {
-			s_logger.error("Unexpected exception ", e);
-		}
-		return "";
-	}
-	
-	private void sendResponse(HttpServletResponse resp, String content) {
-		try {
-			resp.setContentType("text/html");
-			resp.getWriter().print(content);
-		} catch(IOException e) {
-			if(s_logger.isInfoEnabled()) {
+        return sb.toString();
+    }
+
+    public static String genAccessTicket(String host, String port, String sid, String tag) {
+        return genAccessTicket(host, port, sid, tag, new Date());
+    }
+
+    public static String genAccessTicket(String host, String port, String sid, String tag, Date normalizedHashTime) {
+        String params = "host=" + host + "&port=" + port + "&sid=" + sid + "&tag=" + tag;
+
+        try {
+            Mac mac = Mac.getInstance("HmacSHA1");
+
+            long ts = normalizedHashTime.getTime();
+            ts = ts/60000;		// round up to 1 minute
+            String secretKey = _ms.getHashKey();
+
+            SecretKeySpec keySpec = new SecretKeySpec(secretKey.getBytes(), "HmacSHA1");
+            mac.init(keySpec);
+            mac.update(params.getBytes());
+            mac.update(String.valueOf(ts).getBytes());
+
+            byte[] encryptedBytes = mac.doFinal();
+
+            return Base64.encodeBase64URLSafeString(encryptedBytes);
+        } catch(Exception e) {
+            s_logger.error("Unexpected exception ", e);
+        }
+        return "";
+    }
+
+    private void sendResponse(HttpServletResponse resp, String content) {
+        try {
+            resp.setContentType("text/html");
+            resp.getWriter().print(content);
+        } catch(IOException e) {
+            if(s_logger.isInfoEnabled()) {
                 s_logger.info("Client may already close the connection");
             }
-		}
-	}
-	
-	private boolean checkSessionPermision(HttpServletRequest req, long vmId, Account accountObj) {
+        }
+    }
+
+    private boolean checkSessionPermision(HttpServletRequest req, long vmId, Account accountObj) {
 
         VMInstanceVO vm = _vmMgr.findById(vmId);
         if(vm == null) {
-        	s_logger.debug("Console/thumbnail access denied. VM " + vmId + " does not exist in system any more");
-        	return false;
+            s_logger.debug("Console/thumbnail access denied. VM " + vmId + " does not exist in system any more");
+            return false;
         }
-		
+
         // root admin can access anything
-		if(accountObj.getType() == Account.ACCOUNT_TYPE_ADMIN)
-    		return true;
+        if(accountObj.getType() == Account.ACCOUNT_TYPE_ADMIN)
+            return true;
 
         switch(vm.getType())
         {
         case User :
-        	try {
-            	_accountMgr.checkAccess(accountObj, null, true, vm);
-        	} catch (PermissionDeniedException ex) {
-        		if (accountObj.getType() == Account.ACCOUNT_TYPE_NORMAL) {
-        			if (s_logger.isDebugEnabled()) {
-	                    s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() 
-		        			+ " does not match the account id in session " + accountObj.getId() + " and caller is a normal user");
-	                }
-        		} else if(accountObj.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN || accountObj.getType() == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN) {
-        			if(s_logger.isDebugEnabled()) {
-	                    s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() 
-		        			+ " does not match the account id in session " + accountObj.getId() + " and the domain-admin caller does not manage the target domain");
-	                }
-        		}
-        		return false;
-        	}
-        	break;
-        	
+            try {
+                _accountMgr.checkAccess(accountObj, null, true, vm);
+            } catch (PermissionDeniedException ex) {
+                if (accountObj.getType() == Account.ACCOUNT_TYPE_NORMAL) {
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() 
+                                + " does not match the account id in session " + accountObj.getId() + " and caller is a normal user");
+                    }
+                } else if(accountObj.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN || accountObj.getType() == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN) {
+                    if(s_logger.isDebugEnabled()) {
+                        s_logger.debug("VM access is denied. VM owner account " + vm.getAccountId() 
+                                + " does not match the account id in session " + accountObj.getId() + " and the domain-admin caller does not manage the target domain");
+                    }
+                }
+                return false;
+            }
+            break;
+
         case DomainRouter:
         case ConsoleProxy :
         case SecondaryStorageVm:
-    		return false;
-    		
-    	default :
-    		s_logger.warn("Unrecoginized virtual machine type, deny access by default. type: " + vm.getType());
-    		return false;
+            return false;
+
+        default :
+            s_logger.warn("Unrecoginized virtual machine type, deny access by default. type: " + vm.getType());
+            return false;
         }
-        
-		return true;
-	}
-	
-	private boolean isValidCmd(String cmd) {
-		if(cmd.equalsIgnoreCase("thumbnail") || cmd.equalsIgnoreCase("access") || cmd.equalsIgnoreCase("auth")) {
+
+        return true;
+    }
+
+    private boolean isValidCmd(String cmd) {
+        if(cmd.equalsIgnoreCase("thumbnail") || cmd.equalsIgnoreCase("access") || cmd.equalsIgnoreCase("auth")) {
             return true;
         }
-		
-		return false;
-	}
-	
-    public boolean verifyUser(Long userId) {
-    	// copy from ApiServer.java, a bit ugly here
-    	User user = _accountMgr.getUserIncludingRemoved(userId);
-    	Account account = null;
-    	if (user != null) {
-    	    account = _accountMgr.getAccount(user.getAccountId());
-    	}
 
-    	if ((user == null) || (user.getRemoved() != null) || !user.getState().equals(Account.State.enabled) 
-    		|| (account == null) || !account.getState().equals(Account.State.enabled)) {
-    		s_logger.warn("Deleted/Disabled/Locked user with id=" + userId + " attempting to access public API");
-    		return false;
-    	}
-    	return true;
+        return false;
     }
-    
-	// copied and modified from ApiServer.java.
+
+    public boolean verifyUser(Long userId) {
+        // copy from ApiServer.java, a bit ugly here
+        User user = _accountMgr.getUserIncludingRemoved(userId);
+        Account account = null;
+        if (user != null) {
+            account = _accountMgr.getAccount(user.getAccountId());
+        }
+
+        if ((user == null) || (user.getRemoved() != null) || !user.getState().equals(Account.State.enabled) 
+                || (account == null) || !account.getState().equals(Account.State.enabled)) {
+            s_logger.warn("Deleted/Disabled/Locked user with id=" + userId + " attempting to access public API");
+            return false;
+        }
+        return true;
+    }
+
+    // copied and modified from ApiServer.java.
     // TODO need to replace the whole servlet with a API command
     private boolean verifyRequest(Map<String, Object[]> requestParameters) {
         try {
@@ -516,7 +516,7 @@ public class ConsoleProxyServlet extends HttpServlet {
             for (String paramName : parameterNames) {
                 // parameters come as name/value pairs in the form String/String[]
                 String paramValue = ((String[])requestParameters.get(paramName))[0];
-                
+
                 if ("signature".equalsIgnoreCase(paramName)) {
                     signature = paramValue;
                 } else {
@@ -531,7 +531,7 @@ public class ConsoleProxyServlet extends HttpServlet {
                     }
                 }
             }
-            
+
 
             // if api/secret key are passed to the parameters
             if ((signature == null) || (apiKey == null)) {
@@ -573,16 +573,16 @@ public class ConsoleProxyServlet extends HttpServlet {
             mac.init(keySpec);
             mac.update(unsignedRequest.getBytes());
             byte[] encryptedBytes = mac.doFinal();
-            String computedSignature = com.cloud.utils.encoding.Base64.encodeBytes(encryptedBytes);
+            String computedSignature = Base64.encodeBase64URLSafeString(encryptedBytes);
             boolean equalSig = signature.equals(computedSignature);
             if (!equalSig) {
-            	s_logger.debug("User signature: " + signature + " is not equaled to computed signature: " + computedSignature);
+                s_logger.debug("User signature: " + signature + " is not equaled to computed signature: " + computedSignature);
             }
-            
+
             if(equalSig) {
-            	requestParameters.put("userid", new Object[] {String.valueOf(user.getId())});
-            	requestParameters.put("account", new Object[] {account.getAccountName()});
-            	requestParameters.put("accountobj", new Object[] { account });
+                requestParameters.put("userid", new Object[] {String.valueOf(user.getId())});
+                requestParameters.put("account", new Object[] {account.getAccountName()});
+                requestParameters.put("accountobj", new Object[] { account });
             }
             return equalSig;
         } catch (Exception ex) {
@@ -590,23 +590,23 @@ public class ConsoleProxyServlet extends HttpServlet {
         }
         return false;
     }
-    
+
     public static final String escapeHTML(String content){
         if(content == null || content.isEmpty())
             return content;
-        
+
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < content.length(); i++) {
-           char c = content.charAt(i);
-           switch (c) {
-              case '<': sb.append("&lt;"); break;
-              case '>': sb.append("&gt;"); break;
-              case '&': sb.append("&amp;"); break;
-              case '"': sb.append("&quot;"); break;
-              case ' ': sb.append("&nbsp;");break;         
-              default:  sb.append(c); break;
-           }
+            char c = content.charAt(i);
+            switch (c) {
+            case '<': sb.append("&lt;"); break;
+            case '>': sb.append("&gt;"); break;
+            case '&': sb.append("&amp;"); break;
+            case '"': sb.append("&quot;"); break;
+            case ' ': sb.append("&nbsp;");break;         
+            default:  sb.append(c); break;
+            }
         }
         return sb.toString();
-     }    
+    }    
 }
diff --git a/test/src/com/cloud/sample/UserCloudAPIExecutor.java b/test/src/com/cloud/sample/UserCloudAPIExecutor.java
index 0917409e6db..c1246d4f940 100644
--- a/test/src/com/cloud/sample/UserCloudAPIExecutor.java
+++ b/test/src/com/cloud/sample/UserCloudAPIExecutor.java
@@ -31,10 +31,9 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
 
-import com.cloud.utils.encoding.Base64;
 
 /**
-*
+ *
  *
  *
  *
diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
index a4afb804f5e..28f5935e8e6 100644
--- a/test/src/com/cloud/test/stress/StressTestDirectAttach.java
+++ b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
@@ -35,6 +35,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpMethod;
@@ -46,8 +47,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-
-import com.cloud.utils.encoding.Base64;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.trilead.ssh2.ChannelCondition;
 import com.trilead.ssh2.Connection;
@@ -55,28 +54,28 @@ import com.trilead.ssh2.SCPClient;
 import com.trilead.ssh2.Session;
 
 public class StressTestDirectAttach {
-	private static long sleepTime = 180000L; // default 0
-	private static boolean cleanUp = true;
-	public static final Logger s_logger = Logger
-			.getLogger(TestClientWithAPI.class.getName());
-	private static boolean repeat = true;
-	private static String[] users = null;
-	private static boolean internet = false;
-	private static ThreadLocal<String> _linuxIP = new ThreadLocal<String>();
-	private static ThreadLocal<String> _linuxVmId = new ThreadLocal<String>();
-	private static ThreadLocal<String> _linuxVmId1 = new ThreadLocal<String>();
-	private static ThreadLocal<String> _linuxPassword = new ThreadLocal<String>();
-	private static ThreadLocal<String> _windowsIP = new ThreadLocal<String>();
-	private static ThreadLocal<String> _secretKey = new ThreadLocal<String>();
-	private static ThreadLocal<String> _apiKey = new ThreadLocal<String>();
-	private static ThreadLocal<Long> _userId = new ThreadLocal<Long>();
-	private static ThreadLocal<String> _account = new ThreadLocal<String>();
-	private static ThreadLocal<String> _domainRouterId = new ThreadLocal<String>();
-	private static ThreadLocal<String> _newVolume = new ThreadLocal<String>();
-	private static ThreadLocal<String> _newVolume1 = new ThreadLocal<String>();
-	private static DocumentBuilderFactory factory = DocumentBuilderFactory
-			.newInstance();
-	private static int usageIterator = 1;
+    private static long sleepTime = 180000L; // default 0
+    private static boolean cleanUp = true;
+    public static final Logger s_logger = Logger
+            .getLogger(TestClientWithAPI.class.getName());
+    private static boolean repeat = true;
+    private static String[] users = null;
+    private static boolean internet = false;
+    private static ThreadLocal<String> _linuxIP = new ThreadLocal<String>();
+    private static ThreadLocal<String> _linuxVmId = new ThreadLocal<String>();
+    private static ThreadLocal<String> _linuxVmId1 = new ThreadLocal<String>();
+    private static ThreadLocal<String> _linuxPassword = new ThreadLocal<String>();
+    private static ThreadLocal<String> _windowsIP = new ThreadLocal<String>();
+    private static ThreadLocal<String> _secretKey = new ThreadLocal<String>();
+    private static ThreadLocal<String> _apiKey = new ThreadLocal<String>();
+    private static ThreadLocal<Long> _userId = new ThreadLocal<Long>();
+    private static ThreadLocal<String> _account = new ThreadLocal<String>();
+    private static ThreadLocal<String> _domainRouterId = new ThreadLocal<String>();
+    private static ThreadLocal<String> _newVolume = new ThreadLocal<String>();
+    private static ThreadLocal<String> _newVolume1 = new ThreadLocal<String>();
+    private static DocumentBuilderFactory factory = DocumentBuilderFactory
+            .newInstance();
+    private static int usageIterator = 1;
     private static int numThreads = 1;
     private static int wait = 5000;
     private static String accountName = null;
@@ -85,363 +84,364 @@ public class StressTestDirectAttach {
     private static String diskOfferingId="11";
     private static String diskOfferingId1="12";
 
-	private static final int MAX_RETRY_LINUX = 10;
-	private static final int MAX_RETRY_WIN = 10;
-	
+    private static final int MAX_RETRY_LINUX = 10;
+    private static final int MAX_RETRY_WIN = 10;
 
-	public static void main(String[] args) {
-		String host = "http://localhost";
-		String port = "8092";
-		String devPort = "8080";
-		String apiUrl = "/client/api";
 
-		try {
-			// Parameters
-			List<String> argsList = Arrays.asList(args);
-			Iterator<String> iter = argsList.iterator();
-			while (iter.hasNext()) {
-				String arg = iter.next();
-				// host
-				if (arg.equals("-h")) {
-					host = "http://" + iter.next();
-				}
+    public static void main(String[] args) {
+        String host = "http://localhost";
+        String port = "8092";
+        String devPort = "8080";
+        String apiUrl = "/client/api";
 
-				if (arg.equals("-p")) {
-					port = iter.next();
-				}
-				if (arg.equals("-dp")) {
-					devPort = iter.next();
-				}
+        try {
+            // Parameters
+            List<String> argsList = Arrays.asList(args);
+            Iterator<String> iter = argsList.iterator();
+            while (iter.hasNext()) {
+                String arg = iter.next();
+                // host
+                if (arg.equals("-h")) {
+                    host = "http://" + iter.next();
+                }
 
-				if (arg.equals("-t")) {
-					numThreads = Integer.parseInt(iter.next());
-				}
+                if (arg.equals("-p")) {
+                    port = iter.next();
+                }
+                if (arg.equals("-dp")) {
+                    devPort = iter.next();
+                }
 
-				if (arg.equals("-s")) {
-					sleepTime = Long.parseLong(iter.next());
-				}
-				if (arg.equals("-a")) {
-					accountName = iter.next();
-				}
+                if (arg.equals("-t")) {
+                    numThreads = Integer.parseInt(iter.next());
+                }
 
-				if (arg.equals("-c")) {
-					cleanUp = Boolean.parseBoolean(iter.next());
-					if (!cleanUp)
-						sleepTime = 0L; // no need to wait if we don't ever
-					// cleanup
-				}
+                if (arg.equals("-s")) {
+                    sleepTime = Long.parseLong(iter.next());
+                }
+                if (arg.equals("-a")) {
+                    accountName = iter.next();
+                }
 
-				if (arg.equals("-r")) {
-					repeat = Boolean.parseBoolean(iter.next());
-				}
+                if (arg.equals("-c")) {
+                    cleanUp = Boolean.parseBoolean(iter.next());
+                    if (!cleanUp)
+                        sleepTime = 0L; // no need to wait if we don't ever
+                    // cleanup
+                }
 
-				if (arg.equals("-i")) {
-					internet = Boolean.parseBoolean(iter.next());
-				}
-				
-				if (arg.equals("-w")) {
-					wait = Integer.parseInt(iter.next());
-				}
-				
-				if (arg.equals("-z")) {
-					zoneId = iter.next();
-				}
-				
-				if (arg.equals("-so")) {
-					serviceOfferingId = iter.next();
-				}
-				
-			}
+                if (arg.equals("-r")) {
+                    repeat = Boolean.parseBoolean(iter.next());
+                }
 
-			final String server = host + ":" + port + "/";
-			final String developerServer = host + ":" + devPort + apiUrl;
-			s_logger.info("Starting test against server: " + server + " with "
-					+ numThreads + " thread(s)");
-			if (cleanUp)
-				s_logger.info("Clean up is enabled, each test will wait "
-						+ sleepTime + " ms before cleaning up");
+                if (arg.equals("-i")) {
+                    internet = Boolean.parseBoolean(iter.next());
+                }
+
+                if (arg.equals("-w")) {
+                    wait = Integer.parseInt(iter.next());
+                }
+
+                if (arg.equals("-z")) {
+                    zoneId = iter.next();
+                }
+
+                if (arg.equals("-so")) {
+                    serviceOfferingId = iter.next();
+                }
+
+            }
+
+            final String server = host + ":" + port + "/";
+            final String developerServer = host + ":" + devPort + apiUrl;
+            s_logger.info("Starting test against server: " + server + " with "
+                    + numThreads + " thread(s)");
+            if (cleanUp)
+                s_logger.info("Clean up is enabled, each test will wait "
+                        + sleepTime + " ms before cleaning up");
 
 
 
-			for (int i = 0; i < numThreads; i++) {
-				new Thread(new Runnable() {
-					public void run() {
-						do {
-							String username = null;
-							try {
-								long now = System.currentTimeMillis();
-								Random ran = new Random();
-								username = Math.abs(ran.nextInt())+ "-user";
-								NDC.push(username);
-								
-								s_logger.info("Starting test for the user " + username); 
-								int response = executeDeployment(server,
-										developerServer, username);
-								boolean success = false;
-								String reason = null;
-								
-								
-								
-								
-								if (response == 200) {
-									success = true;
-									if (internet) {
-										s_logger
-												.info("Deploy successful...waiting 5 minute before SSH tests");
-										Thread.sleep(300000L); // Wait 60
-										// seconds so
-										// the windows VM
-										// can boot up and do a sys prep.
-										
-											s_logger.info("Begin Linux SSH test for account " + _account.get());
-											reason = sshTest(_linuxIP.get(), _linuxPassword.get());
-										
+            for (int i = 0; i < numThreads; i++) {
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        do {
+                            String username = null;
+                            try {
+                                long now = System.currentTimeMillis();
+                                Random ran = new Random();
+                                username = Math.abs(ran.nextInt())+ "-user";
+                                NDC.push(username);
 
-										if (reason == null) {
-											s_logger
-													.info("Linux SSH test successful for account " + _account.get());
-										}
-									}
-									if (reason == null) {
-										if (internet) {
-											s_logger
-													.info("Windows SSH test successful for account " + _account.get());
-										} else {
-											s_logger
-													.info("deploy test successful....now cleaning up");
-											if (cleanUp) {
-												s_logger
-														.info("Waiting "
-																+ sleepTime
-																+ " ms before cleaning up vms");
-												Thread.sleep(sleepTime);
-											} else {
-												success = true;
-											}
-										}
+                                s_logger.info("Starting test for the user " + username); 
+                                int response = executeDeployment(server,
+                                        developerServer, username);
+                                boolean success = false;
+                                String reason = null;
 
-										if (usageIterator >= numThreads) {
-											int eventsAndBillingResponseCode =
-												executeEventsAndBilling(server, developerServer);
-												s_logger.info("events and usage records command finished with response code: "
-												+ eventsAndBillingResponseCode);
-												usageIterator = 1;
-												
-										}
-										else {	
-											s_logger.info("Skipping events and usage records for this user: usageIterator " + usageIterator+ " and number of Threads " + numThreads);
-											usageIterator++;
-										}
 
-										if ((users == null) && (accountName == null)) {
-											s_logger
-													.info("Sending cleanup command");
-											int cleanupResponseCode = executeCleanup(
-													server, developerServer, username);
-											s_logger
-													.info("cleanup command finished with response code: "
-															+ cleanupResponseCode);
-											success = (cleanupResponseCode == 200);
-										} else {
-											s_logger
-													.info("Sending stop DomR / destroy VM command");
-											int stopResponseCode = executeStop(
-													server, developerServer,
-													username);
-											s_logger
-													.info("stop(destroy) command finished with response code: "
-															+ stopResponseCode);
-											success = (stopResponseCode == 200);
-										}
-										
-									} else {
-										// Just stop but don't destroy the
-										// VMs/Routers
-										s_logger
-												.info("SSH test failed for account " + _account.get() +  "with reason '"
-														+ reason
-														+ "', stopping VMs");
-										int stopResponseCode = executeStop(
-												server, developerServer,
-												username);
-										s_logger
-												.info("stop command finished with response code: "
-														+ stopResponseCode);
-										success = false; // since the SSH test
-										// failed, mark the
-										// whole test as
-										// failure
-									}
-								} else {
-									// Just stop but don't destroy the
-									// VMs/Routers
-									s_logger
-											.info("Deploy test failed with reason '"
-													+ reason
-													+ "', stopping VMs");
-									int stopResponseCode = executeStop(server,
-											developerServer, username);
-									s_logger
-											.info("stop command finished with response code: "
-													+ stopResponseCode);
-									success = false; // since the deploy test
-									// failed, mark the
-									// whole test as failure
-								}
 
-								if (success) {
-									s_logger
-											.info("***** Completed test for user : "
-													+ username
-													+ " in "
-													+ ((System
-															.currentTimeMillis() - now) / 1000L)
-													+ " seconds");
-									
-								} else {
-									s_logger
-											.info("##### FAILED test for user : "
-													+ username
-													+ " in "
-													+ ((System
-															.currentTimeMillis() - now) / 1000L)
-													+ " seconds with reason : "
-													+ reason);
-								}
-								s_logger.info("Sleeping for " + wait + " seconds before starting next iteration");
-								Thread.sleep(wait);
-							} catch (Exception e) {
-								s_logger.warn("Error in thread", e);
-								try {
-									int stopResponseCode = executeStop(server,
-											developerServer, username);
-									s_logger.info("stop response code: "
-											+ stopResponseCode);
-								} catch (Exception e1) {
-								}
-							} finally {
-								NDC.clear();
-							}
-						} while (repeat);
-					}
-				}).start();
-			}
-		} catch (Exception e) {
-			s_logger.error(e);
-		}
-	}
 
-	
-	public static Map<String, List<String>> getMultipleValuesFromXML(
-			InputStream is, String[] tagNames) {
-		Map<String, List<String>> returnValues = new HashMap<String, List<String>>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					s_logger.error("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					List<String> valueList = new ArrayList<String>();
-					for (int j = 0; j < targetNodes.getLength(); j++) {
-						Node node = targetNodes.item(j);
-						valueList.add(node.getTextContent());
-					}
-					returnValues.put(tagNames[i], valueList);
-				}
-			}
-		} catch (Exception ex) {
-			s_logger.error(ex);
-		}
-		return returnValues;
-	}
-	
-	public static Map<String, String> getSingleValueFromXML(InputStream is,
-			String[] tagNames) {
-		Map<String, String> returnValues = new HashMap<String, String>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
+                                if (response == 200) {
+                                    success = true;
+                                    if (internet) {
+                                        s_logger
+                                        .info("Deploy successful...waiting 5 minute before SSH tests");
+                                        Thread.sleep(300000L); // Wait 60
+                                        // seconds so
+                                        // the windows VM
+                                        // can boot up and do a sys prep.
 
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					s_logger.error("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					returnValues.put(tagNames[i], targetNodes.item(0)
-							.getTextContent());
-				}
-			}
-		} catch (Exception ex) {
-			s_logger.error("error processing XML", ex);
-		}
-		return returnValues;
-	}
-	
-	public static Map<String, String> getSingleValueFromXML(Element rootElement,
-			String[] tagNames) {
-		Map<String, String> returnValues = new HashMap<String, String>();
-		if (rootElement == null) {
-			s_logger.error("Root element is null, can't get single value from xml");
-			return null;
-		}
-		try {
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					s_logger.error("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					returnValues.put(tagNames[i], targetNodes.item(0)
-							.getTextContent());
-				}
-			}
-		} catch (Exception ex) {
-			s_logger.error("error processing XML", ex);
-		}
-		return returnValues;
-	}
-	
+                                        s_logger.info("Begin Linux SSH test for account " + _account.get());
+                                        reason = sshTest(_linuxIP.get(), _linuxPassword.get());
 
-	private static List<String> getNonSourceNatIPs(InputStream is) {
-		List<String> returnValues = new ArrayList<String>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
-			NodeList allocatedIpAddrNodes = rootElement
-					.getElementsByTagName("publicipaddress");
-			for (int i = 0; i < allocatedIpAddrNodes.getLength(); i++) {
-				Node allocatedIpAddrNode = allocatedIpAddrNodes.item(i);
-				NodeList childNodes = allocatedIpAddrNode.getChildNodes();
-				String ipAddress = null;
-				boolean isSourceNat = true; // assume it's source nat until we
-				// find otherwise
-				for (int j = 0; j < childNodes.getLength(); j++) {
-					Node n = childNodes.item(j);
-					if ("ipaddress".equals(n.getNodeName())) {
-						ipAddress = n.getTextContent();
-					} else if ("issourcenat".equals(n.getNodeName())) {
-						isSourceNat = Boolean.parseBoolean(n.getTextContent());
-					}
-				}
-				if ((ipAddress != null) && !isSourceNat) {
-					returnValues.add(ipAddress);
-				}
-			}
-		} catch (Exception ex) {
-			s_logger.error(ex);
-		}
-		return returnValues;
-	}
+
+                                        if (reason == null) {
+                                            s_logger
+                                            .info("Linux SSH test successful for account " + _account.get());
+                                        }
+                                    }
+                                    if (reason == null) {
+                                        if (internet) {
+                                            s_logger
+                                            .info("Windows SSH test successful for account " + _account.get());
+                                        } else {
+                                            s_logger
+                                            .info("deploy test successful....now cleaning up");
+                                            if (cleanUp) {
+                                                s_logger
+                                                .info("Waiting "
+                                                        + sleepTime
+                                                        + " ms before cleaning up vms");
+                                                Thread.sleep(sleepTime);
+                                            } else {
+                                                success = true;
+                                            }
+                                        }
+
+                                        if (usageIterator >= numThreads) {
+                                            int eventsAndBillingResponseCode =
+                                                    executeEventsAndBilling(server, developerServer);
+                                            s_logger.info("events and usage records command finished with response code: "
+                                                    + eventsAndBillingResponseCode);
+                                            usageIterator = 1;
+
+                                        }
+                                        else {	
+                                            s_logger.info("Skipping events and usage records for this user: usageIterator " + usageIterator+ " and number of Threads " + numThreads);
+                                            usageIterator++;
+                                        }
+
+                                        if ((users == null) && (accountName == null)) {
+                                            s_logger
+                                            .info("Sending cleanup command");
+                                            int cleanupResponseCode = executeCleanup(
+                                                    server, developerServer, username);
+                                            s_logger
+                                            .info("cleanup command finished with response code: "
+                                                    + cleanupResponseCode);
+                                            success = (cleanupResponseCode == 200);
+                                        } else {
+                                            s_logger
+                                            .info("Sending stop DomR / destroy VM command");
+                                            int stopResponseCode = executeStop(
+                                                    server, developerServer,
+                                                    username);
+                                            s_logger
+                                            .info("stop(destroy) command finished with response code: "
+                                                    + stopResponseCode);
+                                            success = (stopResponseCode == 200);
+                                        }
+
+                                    } else {
+                                        // Just stop but don't destroy the
+                                        // VMs/Routers
+                                        s_logger
+                                        .info("SSH test failed for account " + _account.get() +  "with reason '"
+                                                + reason
+                                                + "', stopping VMs");
+                                        int stopResponseCode = executeStop(
+                                                server, developerServer,
+                                                username);
+                                        s_logger
+                                        .info("stop command finished with response code: "
+                                                + stopResponseCode);
+                                        success = false; // since the SSH test
+                                        // failed, mark the
+                                        // whole test as
+                                        // failure
+                                    }
+                                } else {
+                                    // Just stop but don't destroy the
+                                    // VMs/Routers
+                                    s_logger
+                                    .info("Deploy test failed with reason '"
+                                            + reason
+                                            + "', stopping VMs");
+                                    int stopResponseCode = executeStop(server,
+                                            developerServer, username);
+                                    s_logger
+                                    .info("stop command finished with response code: "
+                                            + stopResponseCode);
+                                    success = false; // since the deploy test
+                                    // failed, mark the
+                                    // whole test as failure
+                                }
+
+                                if (success) {
+                                    s_logger
+                                    .info("***** Completed test for user : "
+                                            + username
+                                            + " in "
+                                            + ((System
+                                                    .currentTimeMillis() - now) / 1000L)
+                                                    + " seconds");
+
+                                } else {
+                                    s_logger
+                                    .info("##### FAILED test for user : "
+                                            + username
+                                            + " in "
+                                            + ((System
+                                                    .currentTimeMillis() - now) / 1000L)
+                                                    + " seconds with reason : "
+                                                    + reason);
+                                }
+                                s_logger.info("Sleeping for " + wait + " seconds before starting next iteration");
+                                Thread.sleep(wait);
+                            } catch (Exception e) {
+                                s_logger.warn("Error in thread", e);
+                                try {
+                                    int stopResponseCode = executeStop(server,
+                                            developerServer, username);
+                                    s_logger.info("stop response code: "
+                                            + stopResponseCode);
+                                } catch (Exception e1) {
+                                }
+                            } finally {
+                                NDC.clear();
+                            }
+                        } while (repeat);
+                    }
+                }).start();
+            }
+        } catch (Exception e) {
+            s_logger.error(e);
+        }
+    }
+
+
+    public static Map<String, List<String>> getMultipleValuesFromXML(
+            InputStream is, String[] tagNames) {
+        Map<String, List<String>> returnValues = new HashMap<String, List<String>>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    s_logger.error("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    List<String> valueList = new ArrayList<String>();
+                    for (int j = 0; j < targetNodes.getLength(); j++) {
+                        Node node = targetNodes.item(j);
+                        valueList.add(node.getTextContent());
+                    }
+                    returnValues.put(tagNames[i], valueList);
+                }
+            }
+        } catch (Exception ex) {
+            s_logger.error(ex);
+        }
+        return returnValues;
+    }
+
+    public static Map<String, String> getSingleValueFromXML(InputStream is,
+            String[] tagNames) {
+        Map<String, String> returnValues = new HashMap<String, String>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    s_logger.error("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    returnValues.put(tagNames[i], targetNodes.item(0)
+                            .getTextContent());
+                }
+            }
+        } catch (Exception ex) {
+            s_logger.error("error processing XML", ex);
+        }
+        return returnValues;
+    }
+
+    public static Map<String, String> getSingleValueFromXML(Element rootElement,
+            String[] tagNames) {
+        Map<String, String> returnValues = new HashMap<String, String>();
+        if (rootElement == null) {
+            s_logger.error("Root element is null, can't get single value from xml");
+            return null;
+        }
+        try {
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    s_logger.error("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    returnValues.put(tagNames[i], targetNodes.item(0)
+                            .getTextContent());
+                }
+            }
+        } catch (Exception ex) {
+            s_logger.error("error processing XML", ex);
+        }
+        return returnValues;
+    }
+
+
+    private static List<String> getNonSourceNatIPs(InputStream is) {
+        List<String> returnValues = new ArrayList<String>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+            NodeList allocatedIpAddrNodes = rootElement
+                    .getElementsByTagName("publicipaddress");
+            for (int i = 0; i < allocatedIpAddrNodes.getLength(); i++) {
+                Node allocatedIpAddrNode = allocatedIpAddrNodes.item(i);
+                NodeList childNodes = allocatedIpAddrNode.getChildNodes();
+                String ipAddress = null;
+                boolean isSourceNat = true; // assume it's source nat until we
+                // find otherwise
+                for (int j = 0; j < childNodes.getLength(); j++) {
+                    Node n = childNodes.item(j);
+                    if ("ipaddress".equals(n.getNodeName())) {
+                        ipAddress = n.getTextContent();
+                    } else if ("issourcenat".equals(n.getNodeName())) {
+                        isSourceNat = Boolean.parseBoolean(n.getTextContent());
+                    }
+                }
+                if ((ipAddress != null) && !isSourceNat) {
+                    returnValues.add(ipAddress);
+                }
+            }
+        } catch (Exception ex) {
+            s_logger.error(ex);
+        }
+        return returnValues;
+    }
 
     private static List<String> getSourceNatIPs(InputStream is) {
         List<String> returnValues = new ArrayList<String>();
@@ -475,519 +475,519 @@ public class StressTestDirectAttach {
     }
 
     private static String executeRegistration(String server, String username,
-			String password) throws HttpException, IOException {
-		String url = server + "?command=registerUserKeys&id=" + _userId.get().toString();
-		s_logger.info("registering: " + username);
-		String returnValue = null;
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(url);
-		int responseCode = client.executeMethod(method);
-		if (responseCode == 200) {
-			InputStream is = method.getResponseBodyAsStream();
-			Map<String, String> requestKeyValues = getSingleValueFromXML(is,
-					new String[] { "apikey", "secretkey" });
-			_apiKey.set(requestKeyValues.get("apikey"));
-			returnValue = requestKeyValues.get("secretkey");
-		} else  {
-			s_logger.error("registration failed with error code: " + responseCode);
-		} 
-		return returnValue;
-	}
+            String password) throws HttpException, IOException {
+        String url = server + "?command=registerUserKeys&id=" + _userId.get().toString();
+        s_logger.info("registering: " + username);
+        String returnValue = null;
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(url);
+        int responseCode = client.executeMethod(method);
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, String> requestKeyValues = getSingleValueFromXML(is,
+                    new String[] { "apikey", "secretkey" });
+            _apiKey.set(requestKeyValues.get("apikey"));
+            returnValue = requestKeyValues.get("secretkey");
+        } else  {
+            s_logger.error("registration failed with error code: " + responseCode);
+        } 
+        return returnValue;
+    }
 
-	private static Integer executeDeployment(String server, String developerServer,
-			String username) throws HttpException, IOException {
-		// test steps:
-		// - create user
-		// - deploy Windows VM
-		// - deploy Linux VM
-		// - associate IP address
-		// - create two IP forwarding rules
-		// - create load balancer rule
-		// - list IP forwarding rules
-		// - list load balancer rules
+    private static Integer executeDeployment(String server, String developerServer,
+            String username) throws HttpException, IOException {
+        // test steps:
+        // - create user
+        // - deploy Windows VM
+        // - deploy Linux VM
+        // - associate IP address
+        // - create two IP forwarding rules
+        // - create load balancer rule
+        // - list IP forwarding rules
+        // - list load balancer rules
 
-		// -----------------------------
-		// CREATE USER
-		// -----------------------------
-		String encodedUsername = URLEncoder.encode(username, "UTF-8");
-		String encryptedPassword = createMD5Password(username);
-		String encodedPassword = URLEncoder.encode(encryptedPassword, "UTF-8");
-		
-		String url = server + "?command=createUser&username=" + encodedUsername
-				+ "&password=" + encodedPassword
-				+ "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0"; 
-		if (accountName != null ) {
-			url = server + "?command=createUser&username=" + encodedUsername
-			+ "&password=" + encodedPassword
-			+ "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0&account=" + accountName;
-		}
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(url);
-		int responseCode = client.executeMethod(method);
-		long userId = -1;
-		if (responseCode == 200) {
-			InputStream is = method.getResponseBodyAsStream();
-			Map<String, String> userIdValues = getSingleValueFromXML(is,
-					new String[] { "id", "account" });
-			String userIdStr = userIdValues.get("id");
-	        s_logger.info("created user " + username + " with id "+ userIdStr);
-			if (userIdStr != null) {
-				userId = Long.parseLong(userIdStr);
-				_userId.set(userId);
-				_account.set(userIdValues.get("account"));
-				if (userId == -1) {
-					s_logger
-							.error("create user (" + username + ") failed to retrieve a valid user id, aborting depolyment test");
-					return -1;
-				}
-			}
-		} else  {
-			s_logger.error("create user test failed for user " + username + " with error code :" + responseCode);
-			return responseCode;
-		} 
+        // -----------------------------
+        // CREATE USER
+        // -----------------------------
+        String encodedUsername = URLEncoder.encode(username, "UTF-8");
+        String encryptedPassword = createMD5Password(username);
+        String encodedPassword = URLEncoder.encode(encryptedPassword, "UTF-8");
 
-		_secretKey.set(executeRegistration(server, username, username));
+        String url = server + "?command=createUser&username=" + encodedUsername
+                + "&password=" + encodedPassword
+                + "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0"; 
+        if (accountName != null ) {
+            url = server + "?command=createUser&username=" + encodedUsername
+                    + "&password=" + encodedPassword
+                    + "&firstname=Test&lastname=Test&email=test@vmops.com&domainId=1&accounttype=0&account=" + accountName;
+        }
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(url);
+        int responseCode = client.executeMethod(method);
+        long userId = -1;
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, String> userIdValues = getSingleValueFromXML(is,
+                    new String[] { "id", "account" });
+            String userIdStr = userIdValues.get("id");
+            s_logger.info("created user " + username + " with id "+ userIdStr);
+            if (userIdStr != null) {
+                userId = Long.parseLong(userIdStr);
+                _userId.set(userId);
+                _account.set(userIdValues.get("account"));
+                if (userId == -1) {
+                    s_logger
+                    .error("create user (" + username + ") failed to retrieve a valid user id, aborting depolyment test");
+                    return -1;
+                }
+            }
+        } else  {
+            s_logger.error("create user test failed for user " + username + " with error code :" + responseCode);
+            return responseCode;
+        } 
 
-		if (_secretKey.get() == null) {
-			s_logger
-					.error("FAILED to retrieve secret key during registration, skipping user: "
-							+ username);
-			return -1;
-		} else {
-			s_logger.info("got secret key: " + _secretKey.get());
-			s_logger.info("got api key: " + _apiKey.get());
-		}
+        _secretKey.set(executeRegistration(server, username, username));
+
+        if (_secretKey.get() == null) {
+            s_logger
+            .error("FAILED to retrieve secret key during registration, skipping user: "
+                    + username);
+            return -1;
+        } else {
+            s_logger.info("got secret key: " + _secretKey.get());
+            s_logger.info("got api key: " + _apiKey.get());
+        }
 
 
-		// ---------------------------------
-		// CREATE NETWORK GROUP AND ADD INGRESS RULE TO IT
-		// ---------------------------------
-			String networkAccount = null;
-			if (accountName != null) {
-				networkAccount = accountName;
-			}
-			else {
-				networkAccount = encodedUsername;
-			}
-			String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
-			String requestToSign = "apikey=" + encodedApiKey
-					+ "&command=createSecurityGroup&name=" + encodedUsername;
-			requestToSign = requestToSign.toLowerCase();
-			String signature = signRequest(requestToSign, _secretKey.get());
-			String encodedSignature = URLEncoder.encode(signature, "UTF-8");
-			url = developerServer + "?command=createSecurityGroup&name=" + encodedUsername + "&apikey=" + encodedApiKey
-					+ "&signature=" + encodedSignature;
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream is = method.getResponseBodyAsStream();
-				Map<String, String> values = getSingleValueFromXML(is,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("Create network rule response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("Create security group response code: " + responseCode);
-				}
-			} else  {
-				s_logger.error("Create security group failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-			
-		
-			String encodedCidr = URLEncoder.encode("192.168.1.143/32", "UTF-8");
-			url = server + "?command=authorizeSecurityGroupIngress&cidrlist=" + encodedCidr + "&endport=22&" +
-					"securitygroupname=" + encodedUsername +"&protocol=tcp&startport=22&account=" + networkAccount + "&domainid=1";
+        // ---------------------------------
+        // CREATE NETWORK GROUP AND ADD INGRESS RULE TO IT
+        // ---------------------------------
+        String networkAccount = null;
+        if (accountName != null) {
+            networkAccount = accountName;
+        }
+        else {
+            networkAccount = encodedUsername;
+        }
+        String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+        String requestToSign = "apikey=" + encodedApiKey
+                + "&command=createSecurityGroup&name=" + encodedUsername;
+        requestToSign = requestToSign.toLowerCase();
+        String signature = signRequest(requestToSign, _secretKey.get());
+        String encodedSignature = URLEncoder.encode(signature, "UTF-8");
+        url = developerServer + "?command=createSecurityGroup&name=" + encodedUsername + "&apikey=" + encodedApiKey
+                + "&signature=" + encodedSignature;
+        method = new GetMethod(url);
+        responseCode = client.executeMethod(method);
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, String> values = getSingleValueFromXML(is,
+                    new String[] { "id" });
 
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("Authorise security group ingress response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("Authorise security group ingress response code: " + responseCode);
-				}
-			} else  {
-				s_logger.error("Authorise security group ingress failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-			
-			
+            if (values.get("id") == null) {
+                s_logger.info("Create network rule response code: 401");
+                return 401;
+            }
+            else {
+                s_logger.info("Create security group response code: " + responseCode);
+            }
+        } else  {
+            s_logger.error("Create security group failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
 
-		// ---------------------------------
-		// DEPLOY LINUX VM
-		// ---------------------------------
-		{
-			long templateId = 2;
-			String encodedZoneId = URLEncoder.encode("" + zoneId, "UTF-8");
-			String encodedServiceOfferingId = URLEncoder.encode(""
-					+ serviceOfferingId, "UTF-8");
-			String encodedTemplateId = URLEncoder.encode("" + templateId,
-					"UTF-8");
-			encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
-			requestToSign = "apikey=" + encodedApiKey
-					+ "&command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&serviceofferingid="
-					+ encodedServiceOfferingId + "&templateid="
-					+ encodedTemplateId + "&zoneid=" + encodedZoneId;
-			requestToSign = requestToSign.toLowerCase();
-			signature = signRequest(requestToSign, _secretKey.get());
-			encodedSignature = URLEncoder.encode(signature, "UTF-8");
-			url = developerServer + "?command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&zoneid=" + encodedZoneId + "&serviceofferingid="
-					+ encodedServiceOfferingId + "&templateid="
-					+ encodedTemplateId + "&apikey=" + encodedApiKey
-					+ "&signature=" + encodedSignature;
 
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id", "ipaddress" });
-				
-				if ((values.get("ipaddress") == null) || (values
-						.get("id") == null)) {
-					s_logger.info("deploy linux vm response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("deploy linux vm response code: " + responseCode);
-					long linuxVMId = Long.parseLong(values.get("id"));
-					s_logger.info("got linux virtual machine id: " + linuxVMId);
-					_linuxVmId.set(values.get("id"));
-					_linuxIP.set(values.get("ipaddress"));
-					_linuxPassword.set("rs-ccb35ea5");
-				}
-			} else  {
-				s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		
-		
-		//Create a new volume
-		{
-			url = server + "?command=createVolume&diskofferingid=" + diskOfferingId + "&zoneid=" + zoneId + "&name=newvolume&account=" +  _account.get() + "&domainid=1";
-			s_logger.info("Creating volume....");
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("create volume response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("create volume response code: " + responseCode);
-					String volumeId = values.get("id");
-					s_logger.info("got volume id: " + volumeId);
-					_newVolume.set(volumeId);
-				}
-			} else  {
-				s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		//attach a new volume to the vm
-		{
-			url = server + "?command=attachVolume&id=" + _newVolume.get() + "&virtualmachineid=" + _linuxVmId.get();
-			s_logger.info("Attaching volume with id " + _newVolume.get() + " to the vm " + _linuxVmId.get());
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			s_logger.info("Attach data volume response code: " + responseCode);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("Attach volume response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("Attach volume response code: " + responseCode);
-				}
-			} else  {
-				s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		//DEPLOY SECOND VM, ADD VOLUME TO IT
-		
-		// ---------------------------------
-		// DEPLOY another linux vm
-		// ---------------------------------
-		{
-			long templateId = 2;
-			String encodedZoneId = URLEncoder.encode("" + zoneId, "UTF-8");
-			String encodedServiceOfferingId = URLEncoder.encode(""
-					+ serviceOfferingId, "UTF-8");
-			String encodedTemplateId = URLEncoder.encode("" + templateId,
-					"UTF-8");
-			encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
-			requestToSign = "apikey=" + encodedApiKey
-					+ "&command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&serviceofferingid="
-					+ encodedServiceOfferingId + "&templateid="
-					+ encodedTemplateId + "&zoneid=" + encodedZoneId;
-			requestToSign = requestToSign.toLowerCase();
-			signature = signRequest(requestToSign, _secretKey.get());
-			encodedSignature = URLEncoder.encode(signature, "UTF-8");
-			url = developerServer + "?command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&zoneid=" + encodedZoneId + "&serviceofferingid="
-					+ encodedServiceOfferingId + "&templateid="
-					+ encodedTemplateId + "&apikey=" + encodedApiKey
-					+ "&signature=" + encodedSignature;
+        String encodedCidr = URLEncoder.encode("192.168.1.143/32", "UTF-8");
+        url = server + "?command=authorizeSecurityGroupIngress&cidrlist=" + encodedCidr + "&endport=22&" +
+                "securitygroupname=" + encodedUsername +"&protocol=tcp&startport=22&account=" + networkAccount + "&domainid=1";
 
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id", "ipaddress" });
-				
-				if ((values.get("ipaddress") == null) || (values
-						.get("id") == null)) {
-					s_logger.info("deploy linux vm response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("deploy linux vm response code: " + responseCode);
-					long linuxVMId = Long.parseLong(values.get("id"));
-					s_logger.info("got linux virtual machine id: " + linuxVMId);
-					_linuxVmId1.set(values.get("id"));
-				}
-			} else  {
-				s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		
-		
-		//Create a new volume
-		{
-			url = server + "?command=createVolume&diskofferingid=" + diskOfferingId1 + "&zoneid=" + zoneId + "&name=newvolume1&account=" +  _account.get() + "&domainid=1";
-			s_logger.info("Creating volume....");
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("create volume response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("create volume response code: " + responseCode);
-					String volumeId = values.get("id");
-					s_logger.info("got volume id: " + volumeId);
-					_newVolume1.set(volumeId);
-				}
-			} else  {
-				s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		//attach a new volume to the vm
-		{
-			url = server + "?command=attachVolume&id=" + _newVolume1.get() + "&virtualmachineid=" + _linuxVmId1.get();
-			s_logger.info("Attaching volume with id " + _newVolume1.get() + " to the vm " + _linuxVmId1.get());
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			s_logger.info("Attach data volume response code: " + responseCode);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				Map<String, String> values = getSingleValueFromXML(el,
-						new String[] { "id" });
-				
-				if (values.get("id") == null) {
-					s_logger.info("Attach volume response code: 401");
-					return 401;
-				}
-				else {
-					s_logger.info("Attach volume response code: " + responseCode);
-				}
-			} else  {
-				s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		return 200;
-	}			
+        method = new GetMethod(url);
+        responseCode = client.executeMethod(method);
+        if (responseCode == 200) {
+            InputStream input = method.getResponseBodyAsStream();
+            Element el = queryAsyncJobResult(server, input);
+            Map<String, String> values = getSingleValueFromXML(el,
+                    new String[] { "id" });
+
+            if (values.get("id") == null) {
+                s_logger.info("Authorise security group ingress response code: 401");
+                return 401;
+            }
+            else {
+                s_logger.info("Authorise security group ingress response code: " + responseCode);
+            }
+        } else  {
+            s_logger.error("Authorise security group ingress failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
+
+
+
+        // ---------------------------------
+        // DEPLOY LINUX VM
+        // ---------------------------------
+        {
+            long templateId = 2;
+            String encodedZoneId = URLEncoder.encode("" + zoneId, "UTF-8");
+            String encodedServiceOfferingId = URLEncoder.encode(""
+                    + serviceOfferingId, "UTF-8");
+            String encodedTemplateId = URLEncoder.encode("" + templateId,
+                    "UTF-8");
+            encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+            requestToSign = "apikey=" + encodedApiKey
+                    + "&command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&serviceofferingid="
+                    + encodedServiceOfferingId + "&templateid="
+                    + encodedTemplateId + "&zoneid=" + encodedZoneId;
+            requestToSign = requestToSign.toLowerCase();
+            signature = signRequest(requestToSign, _secretKey.get());
+            encodedSignature = URLEncoder.encode(signature, "UTF-8");
+            url = developerServer + "?command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&zoneid=" + encodedZoneId + "&serviceofferingid="
+                    + encodedServiceOfferingId + "&templateid="
+                    + encodedTemplateId + "&apikey=" + encodedApiKey
+                    + "&signature=" + encodedSignature;
+
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id", "ipaddress" });
+
+                if ((values.get("ipaddress") == null) || (values
+                        .get("id") == null)) {
+                    s_logger.info("deploy linux vm response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("deploy linux vm response code: " + responseCode);
+                    long linuxVMId = Long.parseLong(values.get("id"));
+                    s_logger.info("got linux virtual machine id: " + linuxVMId);
+                    _linuxVmId.set(values.get("id"));
+                    _linuxIP.set(values.get("ipaddress"));
+                    _linuxPassword.set("rs-ccb35ea5");
+                }
+            } else  {
+                s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+
+
+        //Create a new volume
+        {
+            url = server + "?command=createVolume&diskofferingid=" + diskOfferingId + "&zoneid=" + zoneId + "&name=newvolume&account=" +  _account.get() + "&domainid=1";
+            s_logger.info("Creating volume....");
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id" });
+
+                if (values.get("id") == null) {
+                    s_logger.info("create volume response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("create volume response code: " + responseCode);
+                    String volumeId = values.get("id");
+                    s_logger.info("got volume id: " + volumeId);
+                    _newVolume.set(volumeId);
+                }
+            } else  {
+                s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+        //attach a new volume to the vm
+        {
+            url = server + "?command=attachVolume&id=" + _newVolume.get() + "&virtualmachineid=" + _linuxVmId.get();
+            s_logger.info("Attaching volume with id " + _newVolume.get() + " to the vm " + _linuxVmId.get());
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            s_logger.info("Attach data volume response code: " + responseCode);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id" });
+
+                if (values.get("id") == null) {
+                    s_logger.info("Attach volume response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("Attach volume response code: " + responseCode);
+                }
+            } else  {
+                s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+        //DEPLOY SECOND VM, ADD VOLUME TO IT
+
+        // ---------------------------------
+        // DEPLOY another linux vm
+        // ---------------------------------
+        {
+            long templateId = 2;
+            String encodedZoneId = URLEncoder.encode("" + zoneId, "UTF-8");
+            String encodedServiceOfferingId = URLEncoder.encode(""
+                    + serviceOfferingId, "UTF-8");
+            String encodedTemplateId = URLEncoder.encode("" + templateId,
+                    "UTF-8");
+            encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+            requestToSign = "apikey=" + encodedApiKey
+                    + "&command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&serviceofferingid="
+                    + encodedServiceOfferingId + "&templateid="
+                    + encodedTemplateId + "&zoneid=" + encodedZoneId;
+            requestToSign = requestToSign.toLowerCase();
+            signature = signRequest(requestToSign, _secretKey.get());
+            encodedSignature = URLEncoder.encode(signature, "UTF-8");
+            url = developerServer + "?command=deployVirtualMachine&securitygrouplist=" + encodedUsername + "&zoneid=" + encodedZoneId + "&serviceofferingid="
+                    + encodedServiceOfferingId + "&templateid="
+                    + encodedTemplateId + "&apikey=" + encodedApiKey
+                    + "&signature=" + encodedSignature;
+
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id", "ipaddress" });
+
+                if ((values.get("ipaddress") == null) || (values
+                        .get("id") == null)) {
+                    s_logger.info("deploy linux vm response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("deploy linux vm response code: " + responseCode);
+                    long linuxVMId = Long.parseLong(values.get("id"));
+                    s_logger.info("got linux virtual machine id: " + linuxVMId);
+                    _linuxVmId1.set(values.get("id"));
+                }
+            } else  {
+                s_logger.error("deploy linux vm failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+
+
+        //Create a new volume
+        {
+            url = server + "?command=createVolume&diskofferingid=" + diskOfferingId1 + "&zoneid=" + zoneId + "&name=newvolume1&account=" +  _account.get() + "&domainid=1";
+            s_logger.info("Creating volume....");
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id" });
+
+                if (values.get("id") == null) {
+                    s_logger.info("create volume response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("create volume response code: " + responseCode);
+                    String volumeId = values.get("id");
+                    s_logger.info("got volume id: " + volumeId);
+                    _newVolume1.set(volumeId);
+                }
+            } else  {
+                s_logger.error("create volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+        //attach a new volume to the vm
+        {
+            url = server + "?command=attachVolume&id=" + _newVolume1.get() + "&virtualmachineid=" + _linuxVmId1.get();
+            s_logger.info("Attaching volume with id " + _newVolume1.get() + " to the vm " + _linuxVmId1.get());
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            s_logger.info("Attach data volume response code: " + responseCode);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                Map<String, String> values = getSingleValueFromXML(el,
+                        new String[] { "id" });
+
+                if (values.get("id") == null) {
+                    s_logger.info("Attach volume response code: 401");
+                    return 401;
+                }
+                else {
+                    s_logger.info("Attach volume response code: " + responseCode);
+                }
+            } else  {
+                s_logger.error("Attach volume failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+        return 200;
+    }			
 
 
 
 
-	private static int executeCleanup(String server, String developerServer, String username)
-			throws HttpException, IOException {
-		// test steps:
-		// - get user
-		// - delete user
+    private static int executeCleanup(String server, String developerServer, String username)
+            throws HttpException, IOException {
+        // test steps:
+        // - get user
+        // - delete user
 
-		// -----------------------------
-		// GET USER
-		// -----------------------------
-		String userId = _userId.get().toString();
-		String encodedUserId = URLEncoder.encode(userId, "UTF-8");
-		String url = server + "?command=listUsers&id=" + encodedUserId;
-		s_logger.info("Cleaning up resources for user: " + userId + " with url " + url);
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(url);
-		int responseCode = client.executeMethod(method);
-		s_logger.info("get user response code: " + responseCode);
-		if (responseCode == 200) {
-			InputStream is = method.getResponseBodyAsStream();
-			Map<String, String> userInfo = getSingleValueFromXML(is,
-					new String[] { "username", "id", "account" });
-			if (!username.equals(userInfo.get("username"))) {
-				s_logger
-						.error("get user failed to retrieve requested user, aborting cleanup test" + ". Following URL was sent: " + url);
-				return -1;
-			}
-			
-		} else  {
-			s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			return responseCode;
-		} 
+        // -----------------------------
+        // GET USER
+        // -----------------------------
+        String userId = _userId.get().toString();
+        String encodedUserId = URLEncoder.encode(userId, "UTF-8");
+        String url = server + "?command=listUsers&id=" + encodedUserId;
+        s_logger.info("Cleaning up resources for user: " + userId + " with url " + url);
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(url);
+        int responseCode = client.executeMethod(method);
+        s_logger.info("get user response code: " + responseCode);
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, String> userInfo = getSingleValueFromXML(is,
+                    new String[] { "username", "id", "account" });
+            if (!username.equals(userInfo.get("username"))) {
+                s_logger
+                .error("get user failed to retrieve requested user, aborting cleanup test" + ". Following URL was sent: " + url);
+                return -1;
+            }
 
-		// -----------------------------
-		// UPDATE USER
-		// -----------------------------
-		{
-			url = server + "?command=updateUser&id=" + userId
-					+ "&firstname=delete&lastname=me";
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			s_logger.info("update user response code: " + responseCode);
-			if (responseCode == 200) {
-				InputStream is = method.getResponseBodyAsStream();
-				Map<String, String> success = getSingleValueFromXML(is,
-						new String[] { "success" });
-				s_logger
-				.info("update user..success? " + success.get("success"));
-			} else  {
-				s_logger.error("update user failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		
-		// -----------------------------
-		// Execute reboot/stop/start commands for the VMs before deleting the account - made to exercise xen
-		// -----------------------------
-		
-		//Reboot centos VM
-		String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
-		String requestToSign = "apikey=" + encodedApiKey + "&command=rebootVirtualMachine&id=" + _linuxVmId.get();
-		requestToSign = requestToSign.toLowerCase();
-		String signature = signRequest(requestToSign, _secretKey.get());
-		String encodedSignature = URLEncoder.encode(signature, "UTF-8");
-		
-		url = developerServer + "?command=rebootVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
-				+ encodedApiKey + "&signature=" + encodedSignature;
-		client = new HttpClient();
-		method = new GetMethod(url);
-		responseCode = client.executeMethod(method);
-		s_logger.info("Reboot VM response code: "
-				+ responseCode);
-		if (responseCode == 200) {
-			InputStream input = method.getResponseBodyAsStream();
-			Element el = queryAsyncJobResult(server, input);
-			Map<String, String> success = getSingleValueFromXML(el,
-					new String[] { "success" });
-			s_logger.info("VM was rebooted with the status: "
-					+ success.get("success"));
-		} else  {
-			s_logger.error(" VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			return responseCode;
-		} 
-		
-		//Stop centos VM
-		requestToSign = "apikey=" + encodedApiKey + "&command=stopVirtualMachine&id=" + _linuxVmId.get();
-		requestToSign = requestToSign.toLowerCase();
-		signature = signRequest(requestToSign, _secretKey.get());
-		encodedSignature = URLEncoder.encode(signature, "UTF-8");
-		
-		url = developerServer + "?command=stopVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
-				+ encodedApiKey + "&signature=" + encodedSignature;
-		client = new HttpClient();
-		method = new GetMethod(url);
-		responseCode = client.executeMethod(method);
-		s_logger.info("Stop VM response code: "
-				+ responseCode);
-		if (responseCode == 200) {
-			InputStream input = method.getResponseBodyAsStream();
-			Element el = queryAsyncJobResult(server, input);
-			Map<String, String> success = getSingleValueFromXML(el,
-					new String[] { "success" });
-			s_logger.info("VM was stopped with the status: "
-					+ success.get("success"));
-		} else  {
-			s_logger.error("Stop VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			return responseCode;
-		} 
-		
-		//Start centos VM
-		requestToSign = "apikey=" + encodedApiKey + "&command=startVirtualMachine&id=" + _linuxVmId.get();
-		requestToSign = requestToSign.toLowerCase();
-		signature = signRequest(requestToSign, _secretKey.get());
-		encodedSignature = URLEncoder.encode(signature, "UTF-8");
-		
-		url = developerServer + "?command=startVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
-				+ encodedApiKey + "&signature=" + encodedSignature;
-		client = new HttpClient();
-		method = new GetMethod(url);
-		responseCode = client.executeMethod(method);
-		s_logger.info("Start VM response code: "
-				+ responseCode);
+        } else  {
+            s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
+
+        // -----------------------------
+        // UPDATE USER
+        // -----------------------------
+        {
+            url = server + "?command=updateUser&id=" + userId
+                    + "&firstname=delete&lastname=me";
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            s_logger.info("update user response code: " + responseCode);
+            if (responseCode == 200) {
+                InputStream is = method.getResponseBodyAsStream();
+                Map<String, String> success = getSingleValueFromXML(is,
+                        new String[] { "success" });
+                s_logger
+                .info("update user..success? " + success.get("success"));
+            } else  {
+                s_logger.error("update user failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+
+        // -----------------------------
+        // Execute reboot/stop/start commands for the VMs before deleting the account - made to exercise xen
+        // -----------------------------
+
+        //Reboot centos VM
+        String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+        String requestToSign = "apikey=" + encodedApiKey + "&command=rebootVirtualMachine&id=" + _linuxVmId.get();
+        requestToSign = requestToSign.toLowerCase();
+        String signature = signRequest(requestToSign, _secretKey.get());
+        String encodedSignature = URLEncoder.encode(signature, "UTF-8");
+
+        url = developerServer + "?command=rebootVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
+                + encodedApiKey + "&signature=" + encodedSignature;
+        client = new HttpClient();
+        method = new GetMethod(url);
+        responseCode = client.executeMethod(method);
+        s_logger.info("Reboot VM response code: "
+                + responseCode);
+        if (responseCode == 200) {
+            InputStream input = method.getResponseBodyAsStream();
+            Element el = queryAsyncJobResult(server, input);
+            Map<String, String> success = getSingleValueFromXML(el,
+                    new String[] { "success" });
+            s_logger.info("VM was rebooted with the status: "
+                    + success.get("success"));
+        } else  {
+            s_logger.error(" VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
+
+        //Stop centos VM
+        requestToSign = "apikey=" + encodedApiKey + "&command=stopVirtualMachine&id=" + _linuxVmId.get();
+        requestToSign = requestToSign.toLowerCase();
+        signature = signRequest(requestToSign, _secretKey.get());
+        encodedSignature = URLEncoder.encode(signature, "UTF-8");
+
+        url = developerServer + "?command=stopVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
+                + encodedApiKey + "&signature=" + encodedSignature;
+        client = new HttpClient();
+        method = new GetMethod(url);
+        responseCode = client.executeMethod(method);
+        s_logger.info("Stop VM response code: "
+                + responseCode);
+        if (responseCode == 200) {
+            InputStream input = method.getResponseBodyAsStream();
+            Element el = queryAsyncJobResult(server, input);
+            Map<String, String> success = getSingleValueFromXML(el,
+                    new String[] { "success" });
+            s_logger.info("VM was stopped with the status: "
+                    + success.get("success"));
+        } else  {
+            s_logger.error("Stop VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
+
+        //Start centos VM
+        requestToSign = "apikey=" + encodedApiKey + "&command=startVirtualMachine&id=" + _linuxVmId.get();
+        requestToSign = requestToSign.toLowerCase();
+        signature = signRequest(requestToSign, _secretKey.get());
+        encodedSignature = URLEncoder.encode(signature, "UTF-8");
+
+        url = developerServer + "?command=startVirtualMachine&id=" + _linuxVmId.get() + "&apikey="
+                + encodedApiKey + "&signature=" + encodedSignature;
+        client = new HttpClient();
+        method = new GetMethod(url);
+        responseCode = client.executeMethod(method);
+        s_logger.info("Start VM response code: "
+                + responseCode);
+
+        if (responseCode == 200) {
+            InputStream input = method.getResponseBodyAsStream();
+            Element el = queryAsyncJobResult(server, input);
+            Map<String, String> success = getSingleValueFromXML(el,
+                    new String[] { "id" });
+
+            if (success.get("id") == null) {
+                s_logger.info("Start linux vm response code: 401");
+                return 401;
+            }
+            else {
+                s_logger.info("Start vm response code: " + responseCode);
+            }
+
+            s_logger.info("VM was started with the status: "
+                    + success.get("success"));
+        } else  {
+            s_logger.error("Start VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
 
-		if (responseCode == 200) {
-			InputStream input = method.getResponseBodyAsStream();
-			Element el = queryAsyncJobResult(server, input);
-			Map<String, String> success = getSingleValueFromXML(el,
-					new String[] { "id" });
-			
-			if (success.get("id") == null) {
-				s_logger.info("Start linux vm response code: 401");
-				return 401;
-			}
-			else {
-				s_logger.info("Start vm response code: " + responseCode);
-			}
-		
-			s_logger.info("VM was started with the status: "
-					+ success.get("success"));
-		} else  {
-			s_logger.error("Start VM test failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			return responseCode;
-		} 
-		
 ////		// -----------------------------
 ////		// DISABLE USER
 ////		// -----------------------------
@@ -1008,184 +1008,184 @@ public class StressTestDirectAttach {
 //			} 
 //		}
 
-		// -----------------------------
-		// DELETE USER
-		// -----------------------------
-		{
-			url = server + "?command=deleteUser&id=" + userId;
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			s_logger.info("delete user response code: " + responseCode);
-			if (responseCode == 200) {
-				InputStream input = method.getResponseBodyAsStream();
-				Element el = queryAsyncJobResult(server, input);
-				s_logger
-						.info("Deleted user successfully");
-			} else  {
-				s_logger.error("delete user failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-		}
-		return responseCode;
-	}
+        // -----------------------------
+        // DELETE USER
+        // -----------------------------
+        {
+            url = server + "?command=deleteUser&id=" + userId;
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            s_logger.info("delete user response code: " + responseCode);
+            if (responseCode == 200) {
+                InputStream input = method.getResponseBodyAsStream();
+                Element el = queryAsyncJobResult(server, input);
+                s_logger
+                .info("Deleted user successfully");
+            } else  {
+                s_logger.error("delete user failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+        }
+        return responseCode;
+    }
 
-	private static int executeEventsAndBilling(String server, String developerServer)
-			throws HttpException, IOException {
-		// test steps:
-		// - get all the events in the system for all users in the system
-		// - generate all the usage records in the system
-		// - get all the usage records in the system
+    private static int executeEventsAndBilling(String server, String developerServer)
+            throws HttpException, IOException {
+        // test steps:
+        // - get all the events in the system for all users in the system
+        // - generate all the usage records in the system
+        // - get all the usage records in the system
 
-		// -----------------------------
-		// GET EVENTS
-		// -----------------------------
-		String url =server+"?command=listEvents&page=1&account=" + _account.get();
-		
-		s_logger.info("Getting events for the account " + _account.get());
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(url);
-		int responseCode = client.executeMethod(method);
-		s_logger.info("get events response code: " + responseCode);
-		if (responseCode == 200) {
-			InputStream is = method.getResponseBodyAsStream();
-			Map<String, List<String>> eventDescriptions = getMultipleValuesFromXML(
-					is, new String[] { "description" });
-			List<String> descriptionText = eventDescriptions.get("description");
-			if (descriptionText == null) {
-				s_logger.info("no events retrieved...");
-			} else {
-				for (String text : descriptionText) {
-					s_logger.info("event: " + text);
-				}
-			}
-		} else  {
-			s_logger.error("list events failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			
-			return responseCode;
-		} 
-		return responseCode;
-	}
-	
+        // -----------------------------
+        // GET EVENTS
+        // -----------------------------
+        String url =server+"?command=listEvents&page=1&account=" + _account.get();
 
-	private static int executeStop(String server, String developerServer,
-			String username) throws HttpException, IOException {
-		// test steps:
-		// - get userId for the given username
-		// - list virtual machines for the user
-		// - stop all virtual machines
-		// - get ip addresses for the user
-		// - release ip addresses
+        s_logger.info("Getting events for the account " + _account.get());
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(url);
+        int responseCode = client.executeMethod(method);
+        s_logger.info("get events response code: " + responseCode);
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, List<String>> eventDescriptions = getMultipleValuesFromXML(
+                    is, new String[] { "description" });
+            List<String> descriptionText = eventDescriptions.get("description");
+            if (descriptionText == null) {
+                s_logger.info("no events retrieved...");
+            } else {
+                for (String text : descriptionText) {
+                    s_logger.info("event: " + text);
+                }
+            }
+        } else  {
+            s_logger.error("list events failed with error code: " + responseCode + ". Following URL was sent: " + url);
 
-		// -----------------------------
-		// GET USER
-		// -----------------------------
-		String userId = _userId.get().toString();
-		String encodedUserId = URLEncoder.encode(userId, "UTF-8");
+            return responseCode;
+        } 
+        return responseCode;
+    }
 
-		String url = server + "?command=listUsers&id=" + encodedUserId;
-		s_logger.info("Stopping resources for user: " + username);
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(url);
-		int responseCode = client.executeMethod(method);
-		s_logger.info("get user response code: " + responseCode);
-		if (responseCode == 200) {
-			InputStream is = method.getResponseBodyAsStream();
-			Map<String, String> userIdValues = getSingleValueFromXML(is,
-					new String[] { "id" });
-			String userIdStr = userIdValues.get("id");
-			if (userIdStr != null) {
-				userId = userIdStr;
-				if (userId == null) {
-					s_logger
-							.error("get user failed to retrieve a valid user id, aborting depolyment test" + ". Following URL was sent: " + url);
-					return -1;
-				}
-			}
-		} else  {
-			s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url);
-			return responseCode;
-		} 
 
-		{
-			// ----------------------------------
-			// LIST VIRTUAL MACHINES
-			// ----------------------------------
-			String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
-			String requestToSign = "apikey=" + encodedApiKey
-					+ "&command=listVirtualMachines";
-			requestToSign = requestToSign.toLowerCase();
-			String signature = signRequest(requestToSign, _secretKey.get());
-			String encodedSignature = URLEncoder.encode(signature, "UTF-8");
+    private static int executeStop(String server, String developerServer,
+            String username) throws HttpException, IOException {
+        // test steps:
+        // - get userId for the given username
+        // - list virtual machines for the user
+        // - stop all virtual machines
+        // - get ip addresses for the user
+        // - release ip addresses
 
-			url = developerServer + "?command=listVirtualMachines&apikey=" + encodedApiKey + "&signature="
-					+ encodedSignature;
-			
-			s_logger.info("Listing all virtual machines for the user with url " + url);
-			String[] vmIds = null;
-			client = new HttpClient();
-			method = new GetMethod(url);
-			responseCode = client.executeMethod(method);
-			s_logger.info("list virtual machines response code: "
-					+ responseCode);
-			if (responseCode == 200) {
-				InputStream is = method.getResponseBodyAsStream();
-				Map<String, List<String>> vmIdValues = getMultipleValuesFromXML(
-						is, new String[] { "id" });
-				if (vmIdValues.containsKey("id")) {
-					List<String> vmIdList = vmIdValues.get("id");
-					if (vmIdList != null) {
-						vmIds = new String[vmIdList.size()];
-						vmIdList.toArray(vmIds);
-						String vmIdLogStr = "";
-						if ((vmIds != null) && (vmIds.length > 0)) {
-							vmIdLogStr = vmIds[0];
-							for (int i = 1; i < vmIds.length; i++) {
-								vmIdLogStr = vmIdLogStr + "," + vmIds[i];
-							}
-						}
-						s_logger.info("got virtual machine ids: " + vmIdLogStr);
-					}
-				}
-				
-				
-			} else  {
-				s_logger.error("list virtual machines test failed with error code: " + responseCode + ". Following URL was sent: " + url);
-				return responseCode;
-			} 
-			
-		
-			// ----------------------------------
-			// STOP/DESTROY VIRTUAL MACHINES
-			// ----------------------------------
-			if (vmIds != null) {
-				for (String vmId : vmIds) {
-					requestToSign = "apikey=" + encodedApiKey + "&command=stopVirtualMachine&id=" + vmId;
-					requestToSign = requestToSign.toLowerCase();
-					signature = signRequest(requestToSign, _secretKey.get());
-					encodedSignature = URLEncoder.encode(signature, "UTF-8");
+        // -----------------------------
+        // GET USER
+        // -----------------------------
+        String userId = _userId.get().toString();
+        String encodedUserId = URLEncoder.encode(userId, "UTF-8");
+
+        String url = server + "?command=listUsers&id=" + encodedUserId;
+        s_logger.info("Stopping resources for user: " + username);
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(url);
+        int responseCode = client.executeMethod(method);
+        s_logger.info("get user response code: " + responseCode);
+        if (responseCode == 200) {
+            InputStream is = method.getResponseBodyAsStream();
+            Map<String, String> userIdValues = getSingleValueFromXML(is,
+                    new String[] { "id" });
+            String userIdStr = userIdValues.get("id");
+            if (userIdStr != null) {
+                userId = userIdStr;
+                if (userId == null) {
+                    s_logger
+                    .error("get user failed to retrieve a valid user id, aborting depolyment test" + ". Following URL was sent: " + url);
+                    return -1;
+                }
+            }
+        } else  {
+            s_logger.error("get user failed with error code: " + responseCode + ". Following URL was sent: " + url);
+            return responseCode;
+        } 
+
+        {
+            // ----------------------------------
+            // LIST VIRTUAL MACHINES
+            // ----------------------------------
+            String encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+            String requestToSign = "apikey=" + encodedApiKey
+                    + "&command=listVirtualMachines";
+            requestToSign = requestToSign.toLowerCase();
+            String signature = signRequest(requestToSign, _secretKey.get());
+            String encodedSignature = URLEncoder.encode(signature, "UTF-8");
+
+            url = developerServer + "?command=listVirtualMachines&apikey=" + encodedApiKey + "&signature="
+                    + encodedSignature;
+
+            s_logger.info("Listing all virtual machines for the user with url " + url);
+            String[] vmIds = null;
+            client = new HttpClient();
+            method = new GetMethod(url);
+            responseCode = client.executeMethod(method);
+            s_logger.info("list virtual machines response code: "
+                    + responseCode);
+            if (responseCode == 200) {
+                InputStream is = method.getResponseBodyAsStream();
+                Map<String, List<String>> vmIdValues = getMultipleValuesFromXML(
+                        is, new String[] { "id" });
+                if (vmIdValues.containsKey("id")) {
+                    List<String> vmIdList = vmIdValues.get("id");
+                    if (vmIdList != null) {
+                        vmIds = new String[vmIdList.size()];
+                        vmIdList.toArray(vmIds);
+                        String vmIdLogStr = "";
+                        if ((vmIds != null) && (vmIds.length > 0)) {
+                            vmIdLogStr = vmIds[0];
+                            for (int i = 1; i < vmIds.length; i++) {
+                                vmIdLogStr = vmIdLogStr + "," + vmIds[i];
+                            }
+                        }
+                        s_logger.info("got virtual machine ids: " + vmIdLogStr);
+                    }
+                }
+
+
+            } else  {
+                s_logger.error("list virtual machines test failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                return responseCode;
+            } 
+
+
+            // ----------------------------------
+            // STOP/DESTROY VIRTUAL MACHINES
+            // ----------------------------------
+            if (vmIds != null) {
+                for (String vmId : vmIds) {
+                    requestToSign = "apikey=" + encodedApiKey + "&command=stopVirtualMachine&id=" + vmId;
+                    requestToSign = requestToSign.toLowerCase();
+                    signature = signRequest(requestToSign, _secretKey.get());
+                    encodedSignature = URLEncoder.encode(signature, "UTF-8");
+
+                    url = developerServer + "?command=stopVirtualMachine&id=" + vmId + "&apikey="
+                            + encodedApiKey + "&signature=" + encodedSignature;
+                    client = new HttpClient();
+                    method = new GetMethod(url);
+                    responseCode = client.executeMethod(method);
+                    s_logger.info("StopVirtualMachine" + " [" + vmId + "] response code: "
+                            + responseCode);
+                    if (responseCode == 200) {
+                        InputStream input = method.getResponseBodyAsStream();
+                        Element el = queryAsyncJobResult(server, input);
+                        Map<String, String> success = getSingleValueFromXML(el,
+                                new String[] { "success" });
+                        s_logger.info("StopVirtualMachine..success? "
+                                + success.get("success"));
+                    } else  {
+                        s_logger.error("Stop virtual machine test failed with error code: " + responseCode + ". Following URL was sent: " + url);
+                        return responseCode;
+                    } 
+                }
+            }
 
-					url = developerServer + "?command=stopVirtualMachine&id=" + vmId + "&apikey="
-							+ encodedApiKey + "&signature=" + encodedSignature;
-					client = new HttpClient();
-					method = new GetMethod(url);
-					responseCode = client.executeMethod(method);
-					s_logger.info("StopVirtualMachine" + " [" + vmId + "] response code: "
-							+ responseCode);
-					if (responseCode == 200) {
-						InputStream input = method.getResponseBodyAsStream();
-						Element el = queryAsyncJobResult(server, input);
-						Map<String, String> success = getSingleValueFromXML(el,
-								new String[] { "success" });
-						s_logger.info("StopVirtualMachine..success? "
-								+ success.get("success"));
-					} else  {
-						s_logger.error("Stop virtual machine test failed with error code: " + responseCode + ". Following URL was sent: " + url);
-						return responseCode;
-					} 
-				}
-			}
-			
 //			{
 //				url = server + "?command=deleteUser&id=" + userId;
 //				client = new HttpClient();
@@ -1202,327 +1202,327 @@ public class StressTestDirectAttach {
 //					return responseCode;
 //				} 
 //			}
-			
-			
-		}
 
-		_linuxIP.set("");
-		_linuxVmId.set("");
-		_linuxPassword.set("");
-		_windowsIP.set("");
-		_secretKey.set("");
-		_apiKey.set("");
-		_userId.set(Long.parseLong("0"));
-		_account.set("");
-		_domainRouterId.set("");
-		return responseCode;
-	}
 
-	public static String signRequest(String request, String key) {
-		try {
-			Mac mac = Mac.getInstance("HmacSHA1");
-			SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(),
-					"HmacSHA1");
-			mac.init(keySpec);
-			mac.update(request.getBytes());
-			byte[] encryptedBytes = mac.doFinal();
-			return Base64.encodeBytes(encryptedBytes);
-		} catch (Exception ex) {
-			s_logger.error("unable to sign request", ex);
-		}
-		return null;
-	}
+        }
 
-	private static String sshWinTest(String host) {
-		if (host == null) {
-			s_logger
-					.info("Did not receive a host back from test, ignoring win ssh test");
-			return null;
-		}
+        _linuxIP.set("");
+        _linuxVmId.set("");
+        _linuxPassword.set("");
+        _windowsIP.set("");
+        _secretKey.set("");
+        _apiKey.set("");
+        _userId.set(Long.parseLong("0"));
+        _account.set("");
+        _domainRouterId.set("");
+        return responseCode;
+    }
 
-		// We will retry 5 times before quitting
-		int retry = 1;
+    public static String signRequest(String request, String key) {
+        try {
+            Mac mac = Mac.getInstance("HmacSHA1");
+            SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(),
+                    "HmacSHA1");
+            mac.init(keySpec);
+            mac.update(request.getBytes());
+            byte[] encryptedBytes = mac.doFinal();
+            return Base64.encodeBase64URLSafeString(encryptedBytes);
+        } catch (Exception ex) {
+            s_logger.error("unable to sign request", ex);
+        }
+        return null;
+    }
 
-		while (true) {
-			try {
-				if (retry > 0) {
-					s_logger.info("Retry attempt : " + retry
-							+ " ...sleeping 300 seconds before next attempt. Account is " + _account.get());
-					Thread.sleep(300000);
-				}
+    private static String sshWinTest(String host) {
+        if (host == null) {
+            s_logger
+            .info("Did not receive a host back from test, ignoring win ssh test");
+            return null;
+        }
 
-				s_logger.info("Attempting to SSH into windows host " + host
-						+ " with retry attempt: " + retry + " for account " + _account.get());
+        // We will retry 5 times before quitting
+        int retry = 1;
 
-				Connection conn = new Connection(host);
-				conn.connect(null, 60000, 60000);
+        while (true) {
+            try {
+                if (retry > 0) {
+                    s_logger.info("Retry attempt : " + retry
+                            + " ...sleeping 300 seconds before next attempt. Account is " + _account.get());
+                    Thread.sleep(300000);
+                }
 
-				s_logger.info("User " + _account.get() + " ssHed successfully into windows host " + host);
-				boolean success = false;
-				boolean isAuthenticated = conn.authenticateWithPassword(
-						"Administrator", "password");
-				if (isAuthenticated == false) {
-					return "Authentication failed";
-				}
-				else {
-					s_logger.info("Authentication is successfull");
-				}
-				
-				try {
-					SCPClient scp = new SCPClient(conn);
-					scp.put("wget.exe", "wget.exe", "C:\\Users\\Administrator", "0777");
-					s_logger.info("Successfully put wget.exe file");
-				} catch (Exception ex) {
-					s_logger.error("Unable to put wget.exe " + ex);
-				}
-				
-				if (conn == null ){
-					s_logger.error("Connection is null");
-				}
-				Session sess = conn.openSession();
+                s_logger.info("Attempting to SSH into windows host " + host
+                        + " with retry attempt: " + retry + " for account " + _account.get());
 
-				s_logger.info("User + " + _account.get() + " executing : wget http://192.168.1.250/dump.bin");
-				sess
-						.execCommand("wget http://192.168.1.250/dump.bin && dir dump.bin");
+                Connection conn = new Connection(host);
+                conn.connect(null, 60000, 60000);
 
-				InputStream stdout = sess.getStdout();
-				InputStream stderr = sess.getStderr();
+                s_logger.info("User " + _account.get() + " ssHed successfully into windows host " + host);
+                boolean success = false;
+                boolean isAuthenticated = conn.authenticateWithPassword(
+                        "Administrator", "password");
+                if (isAuthenticated == false) {
+                    return "Authentication failed";
+                }
+                else {
+                    s_logger.info("Authentication is successfull");
+                }
 
-				byte[] buffer = new byte[8192];
-				while (true) {
-					if ((stdout.available() == 0) && (stderr.available() == 0)) {
-						int conditions = sess.waitForCondition(
-								ChannelCondition.STDOUT_DATA
-										| ChannelCondition.STDERR_DATA
-										| ChannelCondition.EOF, 120000);
+                try {
+                    SCPClient scp = new SCPClient(conn);
+                    scp.put("wget.exe", "wget.exe", "C:\\Users\\Administrator", "0777");
+                    s_logger.info("Successfully put wget.exe file");
+                } catch (Exception ex) {
+                    s_logger.error("Unable to put wget.exe " + ex);
+                }
 
-						if ((conditions & ChannelCondition.TIMEOUT) != 0) {
-							s_logger
-									.info("Timeout while waiting for data from peer.");
-							return null;
-						}
+                if (conn == null ){
+                    s_logger.error("Connection is null");
+                }
+                Session sess = conn.openSession();
 
-						if ((conditions & ChannelCondition.EOF) != 0) {
-							if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
-								break;
-							}
-						}
-					}
+                s_logger.info("User + " + _account.get() + " executing : wget http://192.168.1.250/dump.bin");
+                sess
+                .execCommand("wget http://192.168.1.250/dump.bin && dir dump.bin");
 
-					while (stdout.available() > 0) {
-						success = true;
-						int len = stdout.read(buffer);
-						if (len > 0) // this check is somewhat paranoid
-							s_logger.info(new String(buffer, 0, len));
-					}
+                InputStream stdout = sess.getStdout();
+                InputStream stderr = sess.getStderr();
 
-					while (stderr.available() > 0) {
-						/* int len = */stderr.read(buffer);
-					}
-				}
-				sess.close();
-				conn.close();
+                byte[] buffer = new byte[8192];
+                while (true) {
+                    if ((stdout.available() == 0) && (stderr.available() == 0)) {
+                        int conditions = sess.waitForCondition(
+                                ChannelCondition.STDOUT_DATA
+                                | ChannelCondition.STDERR_DATA
+                                | ChannelCondition.EOF, 120000);
 
-				if (success) {
-					Thread.sleep(120000);
-					return null;
-				} else {
-					retry++;
-					if (retry == MAX_RETRY_WIN) {
-						return "SSH Windows Network test fail for account " + _account.get();
-					}
-				}
-			} catch (Exception e) {
-				s_logger.error(e);
-				retry++;
-				if (retry == MAX_RETRY_WIN) {
-					return "SSH Windows Network test fail with error "
-							+ e.getMessage();
-				}
-			}
-		}
-	}
+                        if ((conditions & ChannelCondition.TIMEOUT) != 0) {
+                            s_logger
+                            .info("Timeout while waiting for data from peer.");
+                            return null;
+                        }
 
-	private static String sshTest(String host, String password) {
-		int i = 0;
-		if (host == null) {
-			s_logger
-					.info("Did not receive a host back from test, ignoring ssh test");
-			return null;
-		}
-		
-		if (password == null){
-			s_logger.info("Did not receive a password back from test, ignoring ssh test");
-			return null;
-		}
+                        if ((conditions & ChannelCondition.EOF) != 0) {
+                            if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
+                                break;
+                            }
+                        }
+                    }
 
-		// We will retry 5 times before quitting
-		String result  = null;
-		int retry = 0;
+                    while (stdout.available() > 0) {
+                        success = true;
+                        int len = stdout.read(buffer);
+                        if (len > 0) // this check is somewhat paranoid
+                            s_logger.info(new String(buffer, 0, len));
+                    }
 
-		while (true) {
-			try {
-				if (retry > 0) {
-					s_logger.info("Retry attempt : " + retry
-							+ " ...sleeping 120 seconds before next attempt. Account is " + _account.get());
-					Thread.sleep(120000);
-				}
+                    while (stderr.available() > 0) {
+                        /* int len = */stderr.read(buffer);
+                    }
+                }
+                sess.close();
+                conn.close();
 
-				s_logger.info("Attempting to SSH into linux host " + host
-						+ " with retry attempt: " + retry + ". Account is " + _account.get());
+                if (success) {
+                    Thread.sleep(120000);
+                    return null;
+                } else {
+                    retry++;
+                    if (retry == MAX_RETRY_WIN) {
+                        return "SSH Windows Network test fail for account " + _account.get();
+                    }
+                }
+            } catch (Exception e) {
+                s_logger.error(e);
+                retry++;
+                if (retry == MAX_RETRY_WIN) {
+                    return "SSH Windows Network test fail with error "
+                            + e.getMessage();
+                }
+            }
+        }
+    }
 
-				Connection conn = new Connection(host);
-				conn.connect(null, 60000, 60000);
+    private static String sshTest(String host, String password) {
+        int i = 0;
+        if (host == null) {
+            s_logger
+            .info("Did not receive a host back from test, ignoring ssh test");
+            return null;
+        }
 
-				s_logger.info("User + " + _account.get() + " ssHed successfully into linux host " + host);
+        if (password == null){
+            s_logger.info("Did not receive a password back from test, ignoring ssh test");
+            return null;
+        }
 
-				boolean isAuthenticated = conn.authenticateWithPassword("root",
-						password);
+        // We will retry 5 times before quitting
+        String result  = null;
+        int retry = 0;
 
-				if (isAuthenticated == false) {
-					s_logger.info("Authentication failed for root with password" + password);
-					return "Authentication failed";
-					
-				}
-				
-				boolean success = false;
-				String linuxCommand = null;
-				
-				if (i % 10 == 0) 
-					linuxCommand = "rm -rf *; wget http://192.168.1.250/dump.bin && ls -al dump.bin";
-				else 
-					linuxCommand = "wget http://192.168.1.250/dump.bin && ls -al dump.bin";
-				
-				Session sess = conn.openSession();
-				s_logger.info("User " + _account.get() + " executing : " + linuxCommand);
-				sess.execCommand(linuxCommand);
+        while (true) {
+            try {
+                if (retry > 0) {
+                    s_logger.info("Retry attempt : " + retry
+                            + " ...sleeping 120 seconds before next attempt. Account is " + _account.get());
+                    Thread.sleep(120000);
+                }
 
-				InputStream stdout = sess.getStdout();
-				InputStream stderr = sess.getStderr();
-				
+                s_logger.info("Attempting to SSH into linux host " + host
+                        + " with retry attempt: " + retry + ". Account is " + _account.get());
 
-				byte[] buffer = new byte[8192];
-				while (true) {
-					if ((stdout.available() == 0) && (stderr.available() == 0)) {
-						int conditions = sess.waitForCondition(
-								ChannelCondition.STDOUT_DATA
-										| ChannelCondition.STDERR_DATA
-										| ChannelCondition.EOF, 120000);
+                Connection conn = new Connection(host);
+                conn.connect(null, 60000, 60000);
 
-						if ((conditions & ChannelCondition.TIMEOUT) != 0) {
-							s_logger
-									.info("Timeout while waiting for data from peer.");
-							return null;
-						}
+                s_logger.info("User + " + _account.get() + " ssHed successfully into linux host " + host);
 
-						if ((conditions & ChannelCondition.EOF) != 0) {
-							if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
-								break;
-							}
-						}
-					}
+                boolean isAuthenticated = conn.authenticateWithPassword("root",
+                        password);
 
-					while (stdout.available() > 0) {
-						success = true;
-						int len = stdout.read(buffer);
-						if (len > 0) // this check is somewhat paranoid
-							s_logger.info(new String(buffer, 0, len));
-					}
+                if (isAuthenticated == false) {
+                    s_logger.info("Authentication failed for root with password" + password);
+                    return "Authentication failed";
 
-					while (stderr.available() > 0) {
-						/* int len = */stderr.read(buffer);
-					}
-				}
+                }
 
-				sess.close();
-				conn.close();
-				
-				if (!success) {
-					retry++;
-					if (retry == MAX_RETRY_LINUX) {
-						result = "SSH Linux Network test fail";
-					}
-				}
-				
-					return result;
-			} catch (Exception e) {
-				retry++;
-				s_logger.error("SSH Linux Network test fail with error");
-				if (retry == MAX_RETRY_LINUX) {
-					return "SSH Linux Network test fail with error "
-							+ e.getMessage();
-				}
-			}
-			i++;
-		}
-	}
+                boolean success = false;
+                String linuxCommand = null;
 
-	public static String createMD5Password(String password) {
-		MessageDigest md5;
+                if (i % 10 == 0) 
+                    linuxCommand = "rm -rf *; wget http://192.168.1.250/dump.bin && ls -al dump.bin";
+                else 
+                    linuxCommand = "wget http://192.168.1.250/dump.bin && ls -al dump.bin";
 
-		try {
-			md5 = MessageDigest.getInstance("MD5");
-		} catch (NoSuchAlgorithmException e) {
-			throw new CloudRuntimeException("Error", e);
-		}
+                Session sess = conn.openSession();
+                s_logger.info("User " + _account.get() + " executing : " + linuxCommand);
+                sess.execCommand(linuxCommand);
 
-		md5.reset();
-		BigInteger pwInt = new BigInteger(1, md5.digest(password.getBytes()));
+                InputStream stdout = sess.getStdout();
+                InputStream stderr = sess.getStderr();
 
-		// make sure our MD5 hash value is 32 digits long...
-		StringBuffer sb = new StringBuffer();
-		String pwStr = pwInt.toString(16);
-		int padding = 32 - pwStr.length();
-		for (int i = 0; i < padding; i++) {
-			sb.append('0');
-		}
-		sb.append(pwStr);
-		return sb.toString();
-	}
-	
-	
-	public static Element queryAsyncJobResult (String host, InputStream inputStream) {
-		Element returnBody = null;
-		
-		Map<String, String> values = getSingleValueFromXML(inputStream,
-				new String[] { "jobid" });
-		String jobId = values.get("jobid");
-		
-		if (jobId == null) {
-			s_logger.error("Unable to get a jobId");
-			return null;
-		}
-		
-		//s_logger.info("Job id is " + jobId); 
-		String resultUrl = host + "?command=queryAsyncJobResult&jobid=" + jobId;
-		HttpClient client = new HttpClient();
-		HttpMethod method = new GetMethod(resultUrl);
-		while (true) {
-			try {
-				    client.executeMethod(method);
-				    //s_logger.info("Method is executed successfully. Following url was sent " + resultUrl);
-					InputStream is = method.getResponseBodyAsStream();
-					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-					DocumentBuilder builder = factory.newDocumentBuilder();
-					Document doc = builder.parse(is);
-					returnBody = doc.getDocumentElement();
-					doc.getDocumentElement().normalize();
-					Element jobStatusTag = (Element) returnBody.getElementsByTagName("jobstatus").item(0);
-					String jobStatus = jobStatusTag.getTextContent();
-					if(jobStatus.equals("0")) {
-						try {
-							Thread.sleep(1000);
-						} catch (InterruptedException e) {
-						}
-					} else {
-						break;
-					}
-					
-			} catch (Exception ex) {
-				s_logger.error(ex);
-			}
-		}
-		return returnBody;
-	} 
+
+                byte[] buffer = new byte[8192];
+                while (true) {
+                    if ((stdout.available() == 0) && (stderr.available() == 0)) {
+                        int conditions = sess.waitForCondition(
+                                ChannelCondition.STDOUT_DATA
+                                | ChannelCondition.STDERR_DATA
+                                | ChannelCondition.EOF, 120000);
+
+                        if ((conditions & ChannelCondition.TIMEOUT) != 0) {
+                            s_logger
+                            .info("Timeout while waiting for data from peer.");
+                            return null;
+                        }
+
+                        if ((conditions & ChannelCondition.EOF) != 0) {
+                            if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) == 0) {
+                                break;
+                            }
+                        }
+                    }
+
+                    while (stdout.available() > 0) {
+                        success = true;
+                        int len = stdout.read(buffer);
+                        if (len > 0) // this check is somewhat paranoid
+                            s_logger.info(new String(buffer, 0, len));
+                    }
+
+                    while (stderr.available() > 0) {
+                        /* int len = */stderr.read(buffer);
+                    }
+                }
+
+                sess.close();
+                conn.close();
+
+                if (!success) {
+                    retry++;
+                    if (retry == MAX_RETRY_LINUX) {
+                        result = "SSH Linux Network test fail";
+                    }
+                }
+
+                return result;
+            } catch (Exception e) {
+                retry++;
+                s_logger.error("SSH Linux Network test fail with error");
+                if (retry == MAX_RETRY_LINUX) {
+                    return "SSH Linux Network test fail with error "
+                            + e.getMessage();
+                }
+            }
+            i++;
+        }
+    }
+
+    public static String createMD5Password(String password) {
+        MessageDigest md5;
+
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new CloudRuntimeException("Error", e);
+        }
+
+        md5.reset();
+        BigInteger pwInt = new BigInteger(1, md5.digest(password.getBytes()));
+
+        // make sure our MD5 hash value is 32 digits long...
+        StringBuffer sb = new StringBuffer();
+        String pwStr = pwInt.toString(16);
+        int padding = 32 - pwStr.length();
+        for (int i = 0; i < padding; i++) {
+            sb.append('0');
+        }
+        sb.append(pwStr);
+        return sb.toString();
+    }
+
+
+    public static Element queryAsyncJobResult (String host, InputStream inputStream) {
+        Element returnBody = null;
+
+        Map<String, String> values = getSingleValueFromXML(inputStream,
+                new String[] { "jobid" });
+        String jobId = values.get("jobid");
+
+        if (jobId == null) {
+            s_logger.error("Unable to get a jobId");
+            return null;
+        }
+
+        //s_logger.info("Job id is " + jobId); 
+        String resultUrl = host + "?command=queryAsyncJobResult&jobid=" + jobId;
+        HttpClient client = new HttpClient();
+        HttpMethod method = new GetMethod(resultUrl);
+        while (true) {
+            try {
+                client.executeMethod(method);
+                //s_logger.info("Method is executed successfully. Following url was sent " + resultUrl);
+                InputStream is = method.getResponseBodyAsStream();
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                DocumentBuilder builder = factory.newDocumentBuilder();
+                Document doc = builder.parse(is);
+                returnBody = doc.getDocumentElement();
+                doc.getDocumentElement().normalize();
+                Element jobStatusTag = (Element) returnBody.getElementsByTagName("jobstatus").item(0);
+                String jobStatus = jobStatusTag.getTextContent();
+                if(jobStatus.equals("0")) {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                    }
+                } else {
+                    break;
+                }
+
+            } catch (Exception ex) {
+                s_logger.error(ex);
+            }
+        }
+        return returnBody;
+    } 
 
 }
diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src/com/cloud/test/stress/TestClientWithAPI.java
index 84cb087841b..9d21927932c 100644
--- a/test/src/com/cloud/test/stress/TestClientWithAPI.java
+++ b/test/src/com/cloud/test/stress/TestClientWithAPI.java
@@ -49,7 +49,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.cloud.utils.encoding.Base64;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.trilead.ssh2.ChannelCondition;
 import com.trilead.ssh2.Connection;
@@ -182,7 +181,7 @@ public class TestClientWithAPI {
                 if (arg.equals("-no")) {
                     networkOfferingId = iter.next();
                 }
-                
+
                 if (arg.equals("-pass")) {
                     vmPassword = iter.next();
                 }
@@ -210,6 +209,7 @@ public class TestClientWithAPI {
 
             for (int i = 0; i < numThreads; i++) {
                 new Thread(new Runnable() {
+                    @Override
                     public void run() {
                         do {
                             String username = null;
@@ -440,7 +440,7 @@ public class TestClientWithAPI {
                 for (int j = 0; j < childNodes.getLength(); j++) {
                     Node n = childNodes.item(j);
                     if ("id".equals(n.getNodeName())) {
-                //    if ("ipaddress".equals(n.getNodeName())) {
+                        //    if ("ipaddress".equals(n.getNodeName())) {
                         ipAddress = n.getTextContent();
                     } else if ("issourcenat".equals(n.getNodeName())) {
                         isSourceNat = Boolean.parseBoolean(n.getTextContent());
@@ -478,7 +478,7 @@ public class TestClientWithAPI {
                     }
                     else if("ipaddress".equals(n.getNodeName()))
                     {
-                    	ipAddress = n.getTextContent();
+                        ipAddress = n.getTextContent();
                     }
                     else if ("issourcenat".equals(n.getNodeName())) {
                         isSourceNat = Boolean.parseBoolean(n.getTextContent());
@@ -609,7 +609,7 @@ public class TestClientWithAPI {
             s_logger.error("Create virtual network failed for account " + username + " with error code :" + responseCode + ", aborting deployment test. The command was sent with url " + url);
             return -1;
         }
-/*
+        /*
         // ---------------------------------
         // CREATE DIRECT NETWORK
         // ---------------------------------
@@ -629,9 +629,9 @@ public class TestClientWithAPI {
             s_logger.error("Create direct network failed for account " + username + " with error code :" + responseCode + ", aborting deployment test. The command was sent with url " + url);
             return -1;
         }
-*/
-        
-        
+         */
+
+
         // ---------------------------------
         // DEPLOY LINUX VM
         // ---------------------------------
@@ -706,7 +706,7 @@ public class TestClientWithAPI {
                 } 
                 else
                 {
-                	s_logger.info("Associate IP Address response code: " + responseCode);
+                    s_logger.info("Associate IP Address response code: " + responseCode);
                     long publicIpId = Long.parseLong(values.get("id"));
                     s_logger.info("Associate IP's Id: " + publicIpId);
                     _publicIpId.set(values.get("id"));         
@@ -715,13 +715,13 @@ public class TestClientWithAPI {
                 s_logger.error("associate ip address for windows vm failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
             }
-            
+
             String encodedPublicIpId = URLEncoder.encode(_publicIpId.get(), "UTF-8");
             requestToSign = "apikey=" + encodedApiKey + "&command=listPublicIpAddresses"+"&id="+ encodedPublicIpId;
             requestToSign = requestToSign.toLowerCase();
             signature = signRequest(requestToSign, _secretKey.get());
             encodedSignature = URLEncoder.encode(signature, "UTF-8");
-            
+
             url = developerServer + "?command=listPublicIpAddresses&apikey=" + encodedApiKey + "&id=" + encodedPublicIpId + "&signature=" + encodedSignature;
             client = new HttpClient();
             method = new GetMethod(url);
@@ -730,9 +730,9 @@ public class TestClientWithAPI {
             s_logger.info("list ip addresses for user " + userId + " response code: " + responseCode);
             if (responseCode == 200) {
                 InputStream is = method.getResponseBodyAsStream();
-         //       InputStream ips = method.getResponseBodyAsStream();
+                //       InputStream ips = method.getResponseBodyAsStream();
                 List<String> ipAddressValues = getIPs(is, false);
-         //       List<String> ipAddressVals = getIPs(is, false, true);
+                //       List<String> ipAddressVals = getIPs(is, false, true);
                 if ((ipAddressValues != null) && !ipAddressValues.isEmpty()) {
                     _windowsIpId.set(ipAddressValues.get(0));
                     _windowsIP.set(ipAddressValues.get(1));
@@ -743,7 +743,7 @@ public class TestClientWithAPI {
                 s_logger.error("list ip addresses failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
             }
-            
+
             // ---------------------------------
             // Use the SourceNat IP for linux
             // ---------------------------------
@@ -776,17 +776,17 @@ public class TestClientWithAPI {
                     return responseCode;
                 }
             }
-            
+
             //--------------------------------------------
             // Enable Static NAT for the Source NAT Ip
             //--------------------------------------------
             String encodedSourceNatPublicIpId = URLEncoder.encode(_linuxIpId.get(), "UTF-8");
-                   
-  /*          requestToSign = "apikey=" + encodedApiKey + "&command=enableStaticNat"+"&id=" + encodedSourceNatPublicIpId + "&virtualMachineId=" + encodedVmId;;
+
+            /*          requestToSign = "apikey=" + encodedApiKey + "&command=enableStaticNat"+"&id=" + encodedSourceNatPublicIpId + "&virtualMachineId=" + encodedVmId;;
             requestToSign = requestToSign.toLowerCase();
             signature = signRequest(requestToSign, _secretKey.get());
             encodedSignature = URLEncoder.encode(signature, "UTF-8");
-            
+
             url = developerServer + "?command=enableStaticNat&apikey=" + encodedApiKey + "&signature=" + encodedSignature + "&id=" + encodedSourceNatPublicIpId + "&virtualMachineId=" + encodedVmId;
             client = new HttpClient();
             method = new GetMethod(url);
@@ -801,7 +801,7 @@ public class TestClientWithAPI {
                 s_logger.error("Enable Static NAT failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
             }
-  */          
+             */          
             // -------------------------------------------------------------
             // CREATE IP FORWARDING RULE -- Linux VM
             // -------------------------------------------------------------
@@ -825,7 +825,7 @@ public class TestClientWithAPI {
                 long ipfwdid = Long.parseLong(values.get("id"));
                 s_logger.info("got Port Forwarding Rule's Id:" + ipfwdid);
                 _linipfwdid.set(values.get("id"));
-                
+
             } else {
                 s_logger.error("Port forwarding rule creation failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
@@ -882,7 +882,7 @@ public class TestClientWithAPI {
                     String encodedTemplateId = URLEncoder.encode("" + templateId, "UTF-8");
                     encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
                     String encodedNetworkIds = URLEncoder.encode(_networkId.get()+",206","UTF-8");
-                    
+
                     requestToSign = "apikey=" + encodedApiKey + "&command=deployVirtualMachine&diskofferingid=" + diskOfferingId + "&networkids=" + encodedNetworkIds + "&serviceofferingid=" + encodedServiceOfferingId + "&templateid=" + encodedTemplateId
                             + "&zoneid=" + encodedZoneId;
                     requestToSign = requestToSign.toLowerCase();
@@ -918,14 +918,14 @@ public class TestClientWithAPI {
                 //--------------------------------------------
                 // Enable Static NAT for the Non Source NAT Ip
                 //--------------------------------------------
-                
+
                 encodedVmId = URLEncoder.encode(_windowsVmId.get(), "UTF-8");
                 encodedPublicIpId = URLEncoder.encode(_publicIpId.get(), "UTF-8");
                 requestToSign = "apikey=" + encodedApiKey + "&command=enableStaticNat"+"&ipaddressid="+ encodedPublicIpId + "&virtualMachineId=" + encodedVmId;
                 requestToSign = requestToSign.toLowerCase();
                 signature = signRequest(requestToSign, _secretKey.get());
                 encodedSignature = URLEncoder.encode(signature, "UTF-8");
-                
+
                 url = developerServer + "?command=enableStaticNat&apikey=" + encodedApiKey + "&ipaddressid=" + encodedPublicIpId + "&signature=" + encodedSignature + "&virtualMachineId=" + encodedVmId;
                 client = new HttpClient();
                 method = new GetMethod(url);
@@ -941,7 +941,7 @@ public class TestClientWithAPI {
                     return responseCode;
                 }                                            
 
-                
+
                 // -------------------------------------------------------------
                 // CREATE IP FORWARDING RULE -- Windows VM
                 // -------------------------------------------------------------
@@ -972,7 +972,7 @@ public class TestClientWithAPI {
                     s_logger.error("Port forwarding rule creation failed with error code: " + responseCode + ". Following URL was sent: " + url);
                     return responseCode;
                 }
-           }
+            }
         }
         return responseCode;
     }
@@ -1178,7 +1178,7 @@ public class TestClientWithAPI {
         }
 
         // Create volume from the snapshot created on the previous step and attach it to the running vm
-  /*      encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
+        /*      encodedApiKey = URLEncoder.encode(_apiKey.get(), "UTF-8");
         requestToSign = "apikey=" + encodedApiKey + "&command=createVolume&name=" + _account.get() + "&snapshotid=" + _snapshot.get();
         requestToSign = requestToSign.toLowerCase();
         signature = signRequest(requestToSign, _secretKey.get());
@@ -1222,7 +1222,7 @@ public class TestClientWithAPI {
                 return responseCode;
             }
         }
-*/
+         */
         // -----------------------------
         // Execute reboot/stop/start commands for the VMs before deleting the account - made to exercise xen
         // -----------------------------
@@ -1896,7 +1896,7 @@ public class TestClientWithAPI {
                 InputStream input = method.getResponseBodyAsStream();
                 Element el = queryAsyncJobResult(server, input);
                 s_logger.info("IP forwarding rule was successfully deleted");        
-                
+
             } else {
                 s_logger.error("IP forwarding rule creation failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
@@ -1911,7 +1911,7 @@ public class TestClientWithAPI {
             requestToSign = requestToSign.toLowerCase();
             signature = signRequest(requestToSign, _secretKey.get());
             encodedSignature = URLEncoder.encode(signature, "UTF-8");
-            
+
             url = developerServer + "?command=disableStaticNat&apikey=" + encodedApiKey + "&id=" + encodedPublicIpId + "&signature=" + encodedSignature ;
             client = new HttpClient();
             method = new GetMethod(url);
@@ -1926,7 +1926,7 @@ public class TestClientWithAPI {
                 s_logger.error("Disable Static NAT failed with error code: " + responseCode + ". Following URL was sent: " + url);
                 return responseCode;
             }
-            
+
             // -----------------------------------------
             // DISASSOCIATE IP ADDRESSES
             // -----------------------------------------
@@ -1946,7 +1946,7 @@ public class TestClientWithAPI {
                         InputStream input = method.getResponseBodyAsStream();
                         Element disassocipel = queryAsyncJobResult(server, input);
                         Map<String, String> success = getSingleValueFromXML(disassocipel, new String[] {"success"});
-               //       Map<String, String> success = getSingleValueFromXML(input, new String[] { "success" });
+                        //       Map<String, String> success = getSingleValueFromXML(input, new String[] { "success" });
                         s_logger.info("disassociate ip address..success? " + success.get("success"));
                     } else {
                         s_logger.error("disassociate ip address failed with error code: " + responseCode + ". Following URL was sent: " + url);
@@ -1977,7 +1977,7 @@ public class TestClientWithAPI {
             mac.init(keySpec);
             mac.update(request.getBytes());
             byte[] encryptedBytes = mac.doFinal();
-            return Base64.encodeBytes(encryptedBytes);
+            return org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(encryptedBytes);
         } catch (Exception ex) {
             s_logger.error("unable to sign request", ex);
         }
diff --git a/test/src/com/cloud/test/utils/UtilsForTest.java b/test/src/com/cloud/test/utils/UtilsForTest.java
index 500cea587c7..6414c0b59fc 100644
--- a/test/src/com/cloud/test/utils/UtilsForTest.java
+++ b/test/src/com/cloud/test/utils/UtilsForTest.java
@@ -30,208 +30,208 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.apache.commons.codec.binary.Base64;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.cloud.utils.encoding.Base64;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 public class UtilsForTest {
-	
-	private static DocumentBuilderFactory factory = DocumentBuilderFactory
-	.newInstance();
-	
-	public static boolean verifyTags (Map<String, String> params) {
-		boolean result = true;
-		for (String value : params.keySet()) {
-			if (params.get(value) == null) {
-				result=false;
-			}
-		}
-		return result;
-	}
-	
-	public static boolean verifyTagValues (Map<String, String> params, Map<String, String> pattern) {
-		boolean result = true;
-		
-		if (pattern != null) {
-			for (String value : pattern.keySet()) {
-				if (!pattern.get(value).equals(params.get(value))) {
-					result=false;
-					System.out.println("Tag " + value + " has " + params.get(value) + " while expected value is: " + pattern.get(value));
-				}
-			}
-		}
-		return result;
-	}
-	
-	
-	public static Map<String, String> parseXML(InputStream is,
-			String[] tagNames) {
-		Map<String, String> returnValues = new HashMap<String, String>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
 
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					System.out.println("no " + tagNames[i]
-							+ " tag in the response");
-					returnValues.put(tagNames[i], null);
-				} else {
-					returnValues.put(tagNames[i], targetNodes.item(0)
-							.getTextContent());
-				}
-			}
-		} catch (Exception ex) {
-			System.out.println("error processing XML");
-			ex.printStackTrace();
-		}
-		return returnValues;
-	}
-	
-	
-	public static ArrayList<HashMap<String, String>> parseMulXML (InputStream is, String[] tagNames){
-		ArrayList<HashMap<String, String>> returnValues = new ArrayList<HashMap <String, String>>();
-		
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					System.out.println("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					for (int j = 0; j < targetNodes.getLength(); j++) {
-						HashMap<String, String> valueList = new HashMap<String,String> ();
-						Node node = targetNodes.item(j);
-						//parse child nodes
-						NodeList child = node.getChildNodes();
-						for (int c=0; c<node.getChildNodes().getLength(); c++){
-							child.item(c).getNodeName();
-							valueList.put(child.item(c).getNodeName(), child.item(c).getTextContent());
-						}
-						returnValues.add(valueList);
-					}
-					
-				}
-			}
-		} catch (Exception ex) {
-			System.out.println(ex);
-		}
-		
-		return returnValues;
-	}
-	
-	
-	public static String createMD5String(String password) {
-		MessageDigest md5;
-		try {
-			md5 = MessageDigest.getInstance("MD5");
-		} catch (NoSuchAlgorithmException e) {
-			throw new CloudRuntimeException("Error", e);
-		}
+    private static DocumentBuilderFactory factory = DocumentBuilderFactory
+            .newInstance();
 
-		md5.reset();
-		BigInteger pwInt = new BigInteger(1, md5.digest(password.getBytes()));
+    public static boolean verifyTags (Map<String, String> params) {
+        boolean result = true;
+        for (String value : params.keySet()) {
+            if (params.get(value) == null) {
+                result=false;
+            }
+        }
+        return result;
+    }
 
-		// make sure our MD5 hash value is 32 digits long...
-		StringBuffer sb = new StringBuffer();
-		String pwStr = pwInt.toString(16);
-		int padding = 32 - pwStr.length();
-		for (int i = 0; i < padding; i++) {
-			sb.append('0');
-		}
-		sb.append(pwStr);
-		return sb.toString();
-	}
-	
-	
-	
-	
-	
-	
-	
-	public static Map<String, String> getSingleValueFromXML(InputStream is,
-			String[] tagNames) {
-		Map<String, String> returnValues = new HashMap<String, String>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
+    public static boolean verifyTagValues (Map<String, String> params, Map<String, String> pattern) {
+        boolean result = true;
+
+        if (pattern != null) {
+            for (String value : pattern.keySet()) {
+                if (!pattern.get(value).equals(params.get(value))) {
+                    result=false;
+                    System.out.println("Tag " + value + " has " + params.get(value) + " while expected value is: " + pattern.get(value));
+                }
+            }
+        }
+        return result;
+    }
+
+
+    public static Map<String, String> parseXML(InputStream is,
+            String[] tagNames) {
+        Map<String, String> returnValues = new HashMap<String, String>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    System.out.println("no " + tagNames[i]
+                            + " tag in the response");
+                    returnValues.put(tagNames[i], null);
+                } else {
+                    returnValues.put(tagNames[i], targetNodes.item(0)
+                            .getTextContent());
+                }
+            }
+        } catch (Exception ex) {
+            System.out.println("error processing XML");
+            ex.printStackTrace();
+        }
+        return returnValues;
+    }
+
+
+    public static ArrayList<HashMap<String, String>> parseMulXML (InputStream is, String[] tagNames){
+        ArrayList<HashMap<String, String>> returnValues = new ArrayList<HashMap <String, String>>();
+
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    System.out.println("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    for (int j = 0; j < targetNodes.getLength(); j++) {
+                        HashMap<String, String> valueList = new HashMap<String,String> ();
+                        Node node = targetNodes.item(j);
+                        //parse child nodes
+                        NodeList child = node.getChildNodes();
+                        for (int c=0; c<node.getChildNodes().getLength(); c++){
+                            child.item(c).getNodeName();
+                            valueList.put(child.item(c).getNodeName(), child.item(c).getTextContent());
+                        }
+                        returnValues.add(valueList);
+                    }
+
+                }
+            }
+        } catch (Exception ex) {
+            System.out.println(ex);
+        }
+
+        return returnValues;
+    }
+
+
+    public static String createMD5String(String password) {
+        MessageDigest md5;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException e) {
+            throw new CloudRuntimeException("Error", e);
+        }
+
+        md5.reset();
+        BigInteger pwInt = new BigInteger(1, md5.digest(password.getBytes()));
+
+        // make sure our MD5 hash value is 32 digits long...
+        StringBuffer sb = new StringBuffer();
+        String pwStr = pwInt.toString(16);
+        int padding = 32 - pwStr.length();
+        for (int i = 0; i < padding; i++) {
+            sb.append('0');
+        }
+        sb.append(pwStr);
+        return sb.toString();
+    }
+
+
+
+
+
+
+
+    public static Map<String, String> getSingleValueFromXML(InputStream is,
+            String[] tagNames) {
+        Map<String, String> returnValues = new HashMap<String, String>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    System.out.println("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    returnValues.put(tagNames[i], targetNodes.item(0)
+                            .getTextContent());
+                }
+            }
+        } catch (Exception ex) {
+            System.out.println("error processing XML");
+            ex.printStackTrace();
+        }
+        return returnValues;
+    }
+
+
+    public static Map<String, List<String>> getMultipleValuesFromXML(
+            InputStream is, String[] tagNames) {
+        Map<String, List<String>> returnValues = new HashMap<String, List<String>>();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            Document doc = docBuilder.parse(is);
+            Element rootElement = doc.getDocumentElement();
+            for (int i = 0; i < tagNames.length; i++) {
+                NodeList targetNodes = rootElement
+                        .getElementsByTagName(tagNames[i]);
+                if (targetNodes.getLength() <= 0) {
+                    System.out.println("no " + tagNames[i]
+                            + " tag in XML response...returning null");
+                } else {
+                    List<String> valueList = new ArrayList<String>();
+                    for (int j = 0; j < targetNodes.getLength(); j++) {
+                        Node node = targetNodes.item(j);
+                        valueList.add(node.getTextContent());
+                    }
+                    returnValues.put(tagNames[i], valueList);
+                }
+            }
+        } catch (Exception ex) {
+            System.out.println(ex);
+        }
+        return returnValues;
+    }
+
+
+
+    public static String signRequest(String request, String key) {
+        try {
+            Mac mac = Mac.getInstance("HmacSHA1");
+            SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(),
+                    "HmacSHA1");
+            mac.init(keySpec);
+            mac.update(request.getBytes());
+            byte[] encryptedBytes = mac.doFinal();
+            //System.out.println("HmacSHA1 hash: " + encryptedBytes);
+            return Base64.encodeBase64URLSafeString(encryptedBytes);
+        } catch (Exception ex) {
+            System.out.println("unable to sign request");
+            ex.printStackTrace();
+        }
+        return null;
+    }
 
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					System.out.println("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					returnValues.put(tagNames[i], targetNodes.item(0)
-							.getTextContent());
-				}
-			}
-		} catch (Exception ex) {
-			System.out.println("error processing XML");
-			ex.printStackTrace();
-		}
-		return returnValues;
-	}
-	
-	
-	public static Map<String, List<String>> getMultipleValuesFromXML(
-			InputStream is, String[] tagNames) {
-		Map<String, List<String>> returnValues = new HashMap<String, List<String>>();
-		try {
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			Document doc = docBuilder.parse(is);
-			Element rootElement = doc.getDocumentElement();
-			for (int i = 0; i < tagNames.length; i++) {
-				NodeList targetNodes = rootElement
-						.getElementsByTagName(tagNames[i]);
-				if (targetNodes.getLength() <= 0) {
-					System.out.println("no " + tagNames[i]
-							+ " tag in XML response...returning null");
-				} else {
-					List<String> valueList = new ArrayList<String>();
-					for (int j = 0; j < targetNodes.getLength(); j++) {
-						Node node = targetNodes.item(j);
-						valueList.add(node.getTextContent());
-					}
-					returnValues.put(tagNames[i], valueList);
-				}
-			}
-		} catch (Exception ex) {
-			System.out.println(ex);
-		}
-		return returnValues;
-	}
-	
-	
-	
-	public static String signRequest(String request, String key) {
-		try {
-			Mac mac = Mac.getInstance("HmacSHA1");
-			SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(),
-					"HmacSHA1");
-			mac.init(keySpec);
-			mac.update(request.getBytes());
-			byte[] encryptedBytes = mac.doFinal();
-			//System.out.println("HmacSHA1 hash: " + encryptedBytes);
-			return Base64.encodeBytes(encryptedBytes);
-		} catch (Exception ex) {
-			System.out.println("unable to sign request");
-			ex.printStackTrace();
-		}
-		return null;
-	}
-	
 }
diff --git a/utils/src/com/cloud/utils/encoding/Base64.java b/utils/src/com/cloud/utils/encoding/Base64.java
deleted file mode 100755
index 0179714a0fc..00000000000
--- a/utils/src/com/cloud/utils/encoding/Base64.java
+++ /dev/null
@@ -1,1739 +0,0 @@
-package com.cloud.utils.encoding;
-
-/**
- * <p>Encodes and decodes to and from Base64 notation.</p>
- * <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>
- *
- * <p>
- * Change Log:
- * </p>
- * <ul>
- *  <li>v2.2.1 - Fixed bug using URL_SAFE and ORDERED encodings. Fixed bug
- *   when using very small files (~< 40 bytes).</li>
- *  <li>v2.2 - Added some helper methods for encoding/decoding directly from
- *   one file to the next. Also added a main() method to support command line
- *   encoding/decoding from one file to the next. Also added these Base64 dialects:
- *   <ol>
- *   <li>The default is RFC3548 format.</li>
- *   <li>Calling Base64.setFormat(Base64.BASE64_FORMAT.URLSAFE_FORMAT) generates
- *   http://www.faqs.org/rfcs/rfc3548.html</li>
- *   <li>Calling Base64.setFormat(Base64.BASE64_FORMAT.ORDERED_FORMAT) generates
- *   URL and file name friendly format that preserves lexical ordering as described
- *   in http://www.faqs.org/qa/rfcc-1940.html</li>
- *   </ol>
- *   Special thanks to Jim Kellerman at <a href="http://www.powerset.com/">http://www.powerset.com/</a>
- *   for contributing the new Base64 dialects.
- *  </li>
- * 
- *  <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
- *   some convenience methods for reading and writing to and from files.</li>
- *  <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
- *   with other encodings (like EBCDIC).</li>
- *  <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
- *   encoded data was a single byte.</li>
- *  <li>v2.0 - I got rid of methods that used booleans to set options. 
- *   Now everything is more consolidated and cleaner. The code now detects
- *   when data that's being decoded is gzip-compressed and will decompress it
- *   automatically. Generally things are cleaner. You'll probably have to
- *   change some method calls that you were making to support the new
- *   options format (<tt>int</tt>s that you "OR" together).</li>
- *  <li>v1.5.1 - Fixed bug when decompressing and decoding to a             
- *   byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.      
- *   Added the ability to "suspend" encoding in the Output Stream so        
- *   you can turn on and off the encoding if you need to embed base64       
- *   data in an otherwise "normal" stream (like an XML file).</li>  
- *  <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
- *      This helps when using GZIP streams.
- *      Added the ability to GZip-compress objects before encoding them.</li>
- *  <li>v1.4 - Added helper methods to read/write files.</li>
- *  <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
- *  <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
- *      where last buffer being read, if not completely full, was not returned.</li>
- *  <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
- *  <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
- * </ul>
- *
- * <p>
- * I am placing this code in the Public Domain. Do with it as you will.
- * This software comes with no guarantees or warranties but with
- * plenty of well-wishing instead!
- * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
- * periodically to check for updates or to contribute improvements.
- * </p>
- *
- * @author Robert Harder
- * @author rob@iharder.net
- * @version 2.2.1
- */
-public class Base64
-{
-    
-/* ********  P U B L I C   F I E L D S  ******** */   
-    
-    
-    /** No options specified. Value is zero. */
-    public final static int NO_OPTIONS = 0;
-    
-    /** Specify encoding. */
-    public final static int ENCODE = 1;
-    
-    
-    /** Specify decoding. */
-    public final static int DECODE = 0;
-    
-    
-    /** Specify that data should be gzip-compressed. */
-    public final static int GZIP = 2;
-    
-    
-    /** Don't break lines when encoding (violates strict Base64 specification) */
-    public final static int DONT_BREAK_LINES = 8;
-	
-	/** 
-	 * Encode using Base64-like encoding that is URL- and Filename-safe as described
-	 * in Section 4 of RFC3548: 
-	 * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
-	 * It is important to note that data encoded this way is <em>not</em> officially valid Base64, 
-	 * or at the very least should not be called Base64 without also specifying that is
-	 * was encoded using the URL- and Filename-safe dialect.
-	 */
-	 public final static int URL_SAFE = 16;
-	 
-	 
-	 /**
-	  * Encode using the special "ordered" dialect of Base64 described here:
-	  * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
-	  */
-	 public final static int ORDERED = 32;
-    
-    
-/* ********  P R I V A T E   F I E L D S  ******** */  
-    
-    
-    /** Maximum line length (76) of Base64 output. */
-    private final static int MAX_LINE_LENGTH = 76;
-    
-    
-    /** The equals sign (=) as a byte. */
-    private final static byte EQUALS_SIGN = (byte)'=';
-    
-    
-    /** The new line character (\n) as a byte. */
-    private final static byte NEW_LINE = (byte)'\n';
-    
-    
-    /** Preferred encoding. */
-    private final static String PREFERRED_ENCODING = "UTF-8";
-    
-	
-    // I think I end up not using the BAD_ENCODING indicator.
-    //private final static byte BAD_ENCODING    = -9; // Indicates error in encoding
-    private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
-    private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
-	
-	
-/* ********  S T A N D A R D   B A S E 6 4   A L P H A B E T  ******** */	
-    
-    /** The 64 valid Base64 values. */
-    //private final static byte[] ALPHABET;
-	/* Host platform me be something funny like EBCDIC, so we hardcode these values. */
-	private final static byte[] _STANDARD_ALPHABET =
-    {
-        (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-        (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', 
-        (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-        (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-        (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u', 
-        (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', 
-        (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
-    };
-	
-    
-    /** 
-     * Translates a Base64 value to either its 6-bit reconstruction value
-     * or a negative number indicating some other meaning.
-     **/
-    private final static byte[] _STANDARD_DECODABET =
-    {   
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-        -5,-5,                                      // Whitespace: Tab and Linefeed
-        -9,-9,                                      // Decimal 11 - 12
-        -5,                                         // Whitespace: Carriage Return
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-        -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-        -5,                                         // Whitespace: Space
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-        62,                                         // Plus sign at decimal 43
-        -9,-9,-9,                                   // Decimal 44 - 46
-        63,                                         // Slash at decimal 47
-        52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
-        -9,-9,-9,                                   // Decimal 58 - 60
-        -1,                                         // Equals sign at decimal 61
-        -9,-9,-9,                                      // Decimal 62 - 64
-        0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
-        14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
-        -9,-9,-9,-9,-9,-9,                          // Decimal 91 - 96
-        26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
-        39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
-        -9,-9,-9,-9                                 // Decimal 123 - 126
-        /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
-    };
-	
-	
-/* ********  U R L   S A F E   B A S E 6 4   A L P H A B E T  ******** */
-	
-	/**
-	 * Used in the URL- and Filename-safe dialect described in Section 4 of RFC3548: 
-	 * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
-	 * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus" and "slash."
-	 */
-    private final static byte[] _URL_SAFE_ALPHABET =
-    {
-      (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-      (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-      (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', 
-      (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-      (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-      (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-      (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u', 
-      (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-      (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', 
-      (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'-', (byte)'_'
-    };
-	
-	/**
-	 * Used in decoding URL- and Filename-safe dialects of Base64.
-	 */
-    private final static byte[] _URL_SAFE_DECODABET =
-    {   
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-      -5,-5,                                      // Whitespace: Tab and Linefeed
-      -9,-9,                                      // Decimal 11 - 12
-      -5,                                         // Whitespace: Carriage Return
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-      -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-      -5,                                         // Whitespace: Space
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-      -9,                                         // Plus sign at decimal 43
-      -9,                                         // Decimal 44
-      62,                                         // Minus sign at decimal 45
-      -9,                                         // Decimal 46
-      -9,                                         // Slash at decimal 47
-      52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
-      -9,-9,-9,                                   // Decimal 58 - 60
-      -1,                                         // Equals sign at decimal 61
-      -9,-9,-9,                                   // Decimal 62 - 64
-      0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
-      14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
-      -9,-9,-9,-9,                                // Decimal 91 - 94
-      63,                                         // Underscore at decimal 95
-      -9,                                         // Decimal 96
-      26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
-      39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
-      -9,-9,-9,-9                                 // Decimal 123 - 126
-      /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
-    };
-
-
-
-/* ********  O R D E R E D   B A S E 6 4   A L P H A B E T  ******** */
-
-	/**
-	 * I don't get the point of this technique, but it is described here:
-	 * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
-	 */
-    private final static byte[] _ORDERED_ALPHABET =
-    {
-      (byte)'-',
-      (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4',
-      (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9',
-      (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-      (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-      (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
-      (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-      (byte)'_',
-      (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-      (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-      (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
-      (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z'
-    };
-	
-	/**
-	 * Used in decoding the "ordered" dialect of Base64.
-	 */
-    private final static byte[] _ORDERED_DECODABET =
-    {   
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-      -5,-5,                                      // Whitespace: Tab and Linefeed
-      -9,-9,                                      // Decimal 11 - 12
-      -5,                                         // Whitespace: Carriage Return
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-      -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-      -5,                                         // Whitespace: Space
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-      -9,                                         // Plus sign at decimal 43
-      -9,                                         // Decimal 44
-      0,                                          // Minus sign at decimal 45
-      -9,                                         // Decimal 46
-      -9,                                         // Slash at decimal 47
-      1,2,3,4,5,6,7,8,9,10,                       // Numbers zero through nine
-      -9,-9,-9,                                   // Decimal 58 - 60
-      -1,                                         // Equals sign at decimal 61
-      -9,-9,-9,                                   // Decimal 62 - 64
-      11,12,13,14,15,16,17,18,19,20,21,22,23,     // Letters 'A' through 'M'
-      24,25,26,27,28,29,30,31,32,33,34,35,36,     // Letters 'N' through 'Z'
-      -9,-9,-9,-9,                                // Decimal 91 - 94
-      37,                                         // Underscore at decimal 95
-      -9,                                         // Decimal 96
-      38,39,40,41,42,43,44,45,46,47,48,49,50,     // Letters 'a' through 'm'
-      51,52,53,54,55,56,57,58,59,60,61,62,63,     // Letters 'n' through 'z'
-      -9,-9,-9,-9                                 // Decimal 123 - 126
-      /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
-    };
-
-	
-/* ********  D E T E R M I N E   W H I C H   A L H A B E T  ******** */
-
-
-	/**
-	 * Returns one of the _SOMETHING_ALPHABET byte arrays depending on
-	 * the options specified.
-	 * It's possible, though silly, to specify ORDERED and URLSAFE
-	 * in which case one of them will be picked, though there is
-	 * no guarantee as to which one will be picked.
-     * @param options Specify the type of alphabet desired.
-     * @return The requested alphabet.
-	 */
-	private static byte[] getAlphabet( int options )
-	{
-		if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_ALPHABET;
-		else if( (options & ORDERED) == ORDERED ) return _ORDERED_ALPHABET;
-		else return _STANDARD_ALPHABET;
-		
-    }
-
-	/**
-	 * Returns one of the _SOMETHING_DECODABET byte arrays depending on
-	 * the options specified.
-	 * It's possible, though silly, to specify ORDERED and URL_SAFE
-	 * in which case one of them will be picked, though there is
-	 * no guarantee as to which one will be picked.
-     * @param options Specify the type of alphabet desired.
-     * @return The requested alphabet.
-	 */
-	private static byte[] getDecodabet( int options )
-	{
-		if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_DECODABET;
-		else if( (options & ORDERED) == ORDERED ) return _ORDERED_DECODABET;
-		else return _STANDARD_DECODABET;
-		
-	}
-
-    /** Defeats instantiation. */
-    private Base64(){}
-
-/* ********  E N C O D I N G   M E T H O D S  ******** */
-
-    /**
-     * Encodes up to the first three bytes of array <var>threeBytes</var>
-     * and returns a four-byte array in Base64 notation.
-     * The actual number of significant bytes in your array is
-     * given by <var>numSigBytes</var>.
-     * The array <var>threeBytes</var> needs only be as big as
-     * <var>numSigBytes</var>.
-     * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
-     *
-     * @param b4 A reusable byte array to reduce array instantiation
-     * @param threeBytes the array to convert
-     * @param numSigBytes the number of significant bytes in your array
-     * @param options the alphabet options to use.
-     * @return four byte array in Base64 notation.
-     * @since 1.5.1
-     */
-    private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes, int options )
-    {
-        encode3to4( threeBytes, 0, numSigBytes, b4, 0, options );
-        return b4;
-    }
-
-    /**
-     * <p>Encodes up to three bytes of the array <var>source</var>
-     * and writes the resulting four Base64 bytes to <var>destination</var>.
-     * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying 
-     * <var>srcOffset</var> and <var>destOffset</var>.
-     * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 3 for
-     * the <var>source</var> array or <var>destOffset</var> + 4 for
-     * the <var>destination</var> array.
-     * The actual number of significant bytes in your array is
-     * given by <var>numSigBytes</var>.</p>
-	 * <p>This is the lowest level of the encoding methods with
-	 * all possible parameters.</p>
-     *
-     * @param source the array to convert
-     * @param srcOffset the index where conversion begins
-     * @param numSigBytes the number of significant bytes in your array
-     * @param destination the array to hold the conversion
-     * @param destOffset the index where output will be put
-     * @param options the alphabet options to use
-     * @return the <var>destination</var> array
-     * @since 1.3
-     */
-    private static byte[] encode3to4( 
-     byte[] source, int srcOffset, int numSigBytes,
-     byte[] destination, int destOffset, int options )
-    {
-		byte[] ALPHABET = getAlphabet( options ); 
-	
-        //           1         2         3  
-        // 01234567890123456789012345678901 Bit position
-        // --------000000001111111122222222 Array position from threeBytes
-        // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
-        //          >>18  >>12  >> 6  >> 0  Right shift necessary
-        //                0x3f  0x3f  0x3f  Additional AND
-        
-        // Create buffer with zero-padding if there are only one or two
-        // significant bytes passed in the array.
-        // We have to shift left 24 in order to flush out the 1's that appear
-        // when Java treats a value as negative that is cast from a byte to an int.
-        int inBuff =   ( numSigBytes > 0 ? ((source[ srcOffset     ] << 24) >>>  8) : 0 )
-                     | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
-                     | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
-
-        switch( numSigBytes )
-        {
-            case 3:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
-                destination[ destOffset + 3 ] = ALPHABET[ (inBuff       ) & 0x3f ];
-                return destination;
-                
-            case 2:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
-                destination[ destOffset + 3 ] = EQUALS_SIGN;
-                return destination;
-                
-            case 1:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = EQUALS_SIGN;
-                destination[ destOffset + 3 ] = EQUALS_SIGN;
-                return destination;
-                
-            default:
-                return destination;
-        }   // end switch
-    }
-
-    /**
-     * Serializes an object and returns the Base64-encoded
-     * version of that serialized object. If the object
-     * cannot be serialized or there is another error,
-     * the method will return <tt>null</tt>.
-     * The object is not GZip-compressed before being encoded.
-     *
-     * @param serializableObject The object to encode
-     * @return The Base64-encoded object
-     * @since 1.4
-     */
-    public static String encodeObject( java.io.Serializable serializableObject )
-    {
-        return encodeObject( serializableObject, NO_OPTIONS );
-    }   // end encodeObject
-    
-
-
-    /**
-     * Serializes an object and returns the Base64-encoded
-     * version of that serialized object. If the object
-     * cannot be serialized or there is another error,
-     * the method will return <tt>null</tt>.
-     * <p>
-     * Valid options:<pre>
-     *   GZIP: gzip-compresses object before encoding it.
-     *   DONT_BREAK_LINES: don't break lines at 76 characters
-     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
-     * </pre>
-     * <p>
-     * Example: <code>encodeObject( myObj, Base64.GZIP )</code> or
-     * <p>
-     * Example: <code>encodeObject( myObj, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
-     *
-     * @param serializableObject The object to encode
-     * @param options Specified options
-     * @return The Base64-encoded object
-     * @see Base64#GZIP
-     * @see Base64#DONT_BREAK_LINES
-     * @since 2.0
-     */
-    public static String encodeObject( java.io.Serializable serializableObject, int options )
-    {
-        // Streams
-        java.io.ByteArrayOutputStream  baos  = null; 
-        java.io.OutputStream           b64os = null; 
-        java.io.ObjectOutputStream     oos   = null; 
-        java.util.zip.GZIPOutputStream gzos  = null;
-        
-        // Isolate options
-        int gzip           = (options & GZIP);
-
-        try
-        {
-            // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
-            baos  = new java.io.ByteArrayOutputStream();
-            b64os = new Base64.OutputStream( baos, ENCODE | options );
-    
-            // GZip?
-            if( gzip == GZIP )
-            {
-                gzos = new java.util.zip.GZIPOutputStream( b64os );
-                oos  = new java.io.ObjectOutputStream( gzos );
-            }   // end if: gzip
-            else
-                oos   = new java.io.ObjectOutputStream( b64os );
-            
-            oos.writeObject( serializableObject );
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            e.printStackTrace();
-            return null;
-        }   // end catch
-        finally
-        {
-            try{ oos.close();   } catch( Exception e ){ /* empty */ }
-            try{ gzos.close();  } catch( Exception e ){ /* empty */ }
-            try{ b64os.close(); } catch( Exception e ){ /* empty */ }
-            try{ baos.close();  } catch( Exception e ){ /* empty */ }
-        }   // end finally
-        
-        // Return value according to relevant encoding.
-        try 
-        {
-            return new String( baos.toByteArray(), PREFERRED_ENCODING );
-        }   // end try
-        catch (java.io.UnsupportedEncodingException uue)
-        {
-            return new String( baos.toByteArray() );
-        }   // end catch
-        
-    }   // end encode
-    
-    
-
-    /**
-     * Encodes a byte array into Base64 notation.
-     * Does not GZip-compress data.
-     *
-     * @param source The data to convert
-     * @return the string of encoded bytes.
-     * @since 1.4
-     */
-    public static String encodeBytes( byte[] source )
-    {
-        return encodeBytes( source, 0, source.length, NO_OPTIONS );
-    }   // end encodeBytes
-    
-
-
-    /**
-     * Encodes a byte array into Base64 notation.
-     * <p>
-     * Valid options:<pre>
-     *   GZIP: gzip-compresses object before encoding it.
-     *   DONT_BREAK_LINES: don't break lines at 76 characters
-     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
-     * </pre>
-     * <p>
-     * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
-     * <p>
-     * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
-     *
-     *
-     * @param source The data to convert
-     * @param options Specified options
-     * @return the string of encoded bytes
-     * @see Base64#GZIP
-     * @see Base64#DONT_BREAK_LINES
-     * @since 2.0
-     */
-    public static String encodeBytes( byte[] source, int options )
-    {   
-        return encodeBytes( source, 0, source.length, options );
-    }   // end encodeBytes
-    
-    
-    /**
-     * Encodes a byte array into Base64 notation.
-     * Does not GZip-compress data.
-     *
-     * @param source The data to convert
-     * @param off Offset in array where conversion should begin
-     * @param len Length of data to convert
-     * @return the string of encoded bytes
-     * @since 1.4
-     */
-    public static String encodeBytes( byte[] source, int off, int len )
-    {
-        return encodeBytes( source, off, len, NO_OPTIONS );
-    }   // end encodeBytes
-    
-    
-
-    /**
-     * Encodes a byte array into Base64 notation.
-     * <p>
-     * Valid options:<pre>
-     *   GZIP: gzip-compresses object before encoding it.
-     *   DONT_BREAK_LINES: don't break lines at 76 characters
-     *     <i>Note: Technically, this makes your encoding non-compliant.</i>
-     * </pre>
-     * <p>
-     * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
-     * <p>
-     * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
-     *
-     *
-     * @param source The data to convert
-     * @param off Offset in array where conversion should begin
-     * @param len Length of data to convert
-	 * @param options alphabet type is pulled from this (standard, url-safe, ordered)
-     * @return the string of encoded bytes
-     * @see Base64#GZIP
-     * @see Base64#DONT_BREAK_LINES
-     * @since 2.0
-     */
-    public static String encodeBytes( byte[] source, int off, int len, int options )
-    {
-        // Isolate options
-        int dontBreakLines = ( options & DONT_BREAK_LINES );
-        int gzip           = ( options & GZIP   );
-        
-        // Compress?
-        if( gzip == GZIP )
-        {
-            java.io.ByteArrayOutputStream  baos  = null;
-            java.util.zip.GZIPOutputStream gzos  = null;
-            Base64.OutputStream            b64os = null;
-            
-    
-            try
-            {
-                // GZip -> Base64 -> ByteArray
-                baos = new java.io.ByteArrayOutputStream();
-                b64os = new Base64.OutputStream( baos, ENCODE | options );
-                gzos  = new java.util.zip.GZIPOutputStream( b64os ); 
-            
-                gzos.write( source, off, len );
-                gzos.close();
-            }   // end try
-            catch( java.io.IOException e )
-            {
-                e.printStackTrace();
-                return null;
-            }   // end catch
-            finally
-            {
-                try{ gzos.close();  } catch( Exception e ){ /* empty */ }
-                try{ b64os.close(); } catch( Exception e ){ /* empty */ }
-                try{ baos.close();  } catch( Exception e ){ /* empty */ }
-            }   // end finally
-
-            // Return value according to relevant encoding.
-            try
-            {
-                return new String( baos.toByteArray(), PREFERRED_ENCODING );
-            }   // end try
-            catch (java.io.UnsupportedEncodingException uue)
-            {
-                return new String( baos.toByteArray() );
-            }   // end catch
-        }   // end if: compress
-        
-        // Else, don't compress. Better not to use streams at all then.
-        else
-        {
-            // Convert option to boolean in way that code likes it.
-            boolean breakLines = dontBreakLines == 0;
-            
-            int    len43   = len * 4 / 3;
-            byte[] outBuff = new byte[   ( len43 )                      // Main 4:3
-                                       + ( (len % 3) > 0 ? 4 : 0 )      // Account for padding
-                                       + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines      
-            int d = 0;
-            int e = 0;
-            int len2 = len - 2;
-            int lineLength = 0;
-            for( ; d < len2; d+=3, e+=4 )
-            {
-                encode3to4( source, d+off, 3, outBuff, e, options );
-
-                lineLength += 4;
-                if( breakLines && lineLength == MAX_LINE_LENGTH )
-                {   
-                    outBuff[e+4] = NEW_LINE;
-                    e++;
-                    lineLength = 0;
-                }   // end if: end of line
-            }   // en dfor: each piece of array
-
-            if( d < len )
-            {
-                encode3to4( source, d+off, len - d, outBuff, e, options );
-                e += 4;
-            }   // end if: some padding needed
-
-            
-            // Return value according to relevant encoding.
-            try
-            {
-                return new String( outBuff, 0, e, PREFERRED_ENCODING );
-            }   // end try
-            catch (java.io.UnsupportedEncodingException uue)
-            {
-                return new String( outBuff, 0, e );
-            }   // end catch
-            
-        }   // end else: don't compress
-        
-    }   // end encodeBytes
-    
-
-    
-    
-    
-/* ********  D E C O D I N G   M E T H O D S  ******** */
-    
-    
-    /**
-     * Decodes four bytes from array <var>source</var>
-     * and writes the resulting bytes (up to three of them)
-     * to <var>destination</var>.
-     * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying 
-     * <var>srcOffset</var> and <var>destOffset</var>.
-     * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 4 for
-     * the <var>source</var> array or <var>destOffset</var> + 3 for
-     * the <var>destination</var> array.
-     * This method returns the actual number of bytes that 
-     * were converted from the Base64 encoding.
-	 * <p>This is the lowest level of the decoding methods with
-	 * all possible parameters.</p>
-     * 
-     *
-     * @param source the array to convert
-     * @param srcOffset the index where conversion begins
-     * @param destination the array to hold the conversion
-     * @param destOffset the index where output will be put
-	 * @param options alphabet type is pulled from this (standard, url-safe, ordered)
-     * @return the number of decoded bytes converted
-     * @since 1.3
-     */
-    private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset, int options )
-    {
-		byte[] DECODABET = getDecodabet( options ); 
-	
-        // Example: Dk==
-        if( source[ srcOffset + 2] == EQUALS_SIGN )
-        {
-            // Two ways to do the same thing. Don't know which way I like best.
-            //int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] << 24 ) >>>  6 )
-            //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
-            
-            destination[ destOffset ] = (byte)( outBuff >>> 16 );
-            return 1;
-        }
-        
-        // Example: DkL=
-        else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
-        {
-            // Two ways to do the same thing. Don't know which way I like best.
-            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
-            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
-            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
-                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6 );
-            
-            destination[ destOffset     ] = (byte)( outBuff >>> 16 );
-            destination[ destOffset + 1 ] = (byte)( outBuff >>>  8 );
-            return 2;
-        }
-        
-        // Example: DkLE
-        else
-        {
-            try{
-            // Two ways to do the same thing. Don't know which way I like best.
-            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
-            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
-            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
-            //              | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
-                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6)
-                          | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF )      );
-
-            
-            destination[ destOffset     ] = (byte)( outBuff >> 16 );
-            destination[ destOffset + 1 ] = (byte)( outBuff >>  8 );
-            destination[ destOffset + 2 ] = (byte)( outBuff       );
-
-            return 3;
-            }catch( Exception e){
-                System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset     ] ]  ) );
-                System.out.println(""+source[srcOffset+1]+  ": " + ( DECODABET[ source[ srcOffset + 1 ] ]  ) );
-                System.out.println(""+source[srcOffset+2]+  ": " + ( DECODABET[ source[ srcOffset + 2 ] ]  ) );
-                System.out.println(""+source[srcOffset+3]+  ": " + ( DECODABET[ source[ srcOffset + 3 ] ]  ) );
-                return -1;
-            }   // end catch
-        }
-    }   // end decodeToBytes
-    
-    
-    
-    
-    /**
-     * Very low-level access to decoding ASCII characters in
-     * the form of a byte array. Does not support automatically
-     * gunzipping or any other "fancy" features.
-     *
-     * @param source The Base64 encoded data
-     * @param off    The offset of where to begin decoding
-     * @param len    The length of characters to decode
-     * @param options alphabet type is pulled from this (standard, url-safe, ordered)
-     * @return decoded data
-     * @since 1.3
-     */
-    public static byte[] decode( byte[] source, int off, int len, int options )
-    {
-		byte[] DECODABET = getDecodabet( options );
-	
-        int    len34   = len * 3 / 4;
-        byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
-        int    outBuffPosn = 0;
-        
-        byte[] b4        = new byte[4];
-        int    b4Posn    = 0;
-        int    i;
-        byte   sbiCrop;
-        byte   sbiDecode;
-        for( i = off; i < off+len; i++ )
-        {
-            sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
-            sbiDecode = DECODABET[ sbiCrop ];
-            
-            if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
-            {
-                if( sbiDecode >= EQUALS_SIGN_ENC )
-                {
-                    b4[ b4Posn++ ] = sbiCrop;
-                    if( b4Posn > 3 )
-                    {
-                        outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn, options );
-                        b4Posn = 0;
-                        
-                        // If that was the equals sign, break out of 'for' loop
-                        if( sbiCrop == EQUALS_SIGN )
-                            break;
-                    }   // end if: quartet built
-                    
-                }   // end if: equals sign or better
-                
-            }   // end if: white space, equals sign or better
-            else
-            {
-                System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
-                return null;
-            }   // end else: 
-        }   // each input character
-                                   
-        byte[] out = new byte[ outBuffPosn ];
-        System.arraycopy( outBuff, 0, out, 0, outBuffPosn ); 
-        return out;
-    }   // end decode
-    
-    
-	
-	
-    /**
-     * Decodes data from Base64 notation, automatically
-     * detecting gzip-compressed data and decompressing it.
-     *
-     * @param s the string to decode
-     * @return the decoded data
-     * @since 1.4
-     */
-    public static byte[] decode( String s )
-	{
-		return decode( s, NO_OPTIONS );
-	}
-    
-    
-    /**
-     * Decodes data from Base64 notation, automatically
-     * detecting gzip-compressed data and decompressing it.
-     *
-     * @param s the string to decode
-	 * @param options encode options such as URL_SAFE
-     * @return the decoded data
-     * @since 1.4
-     */
-    public static byte[] decode( String s, int options )
-    {   
-        byte[] bytes;
-        try
-        {
-            bytes = s.getBytes( PREFERRED_ENCODING );
-        }   // end try
-        catch( java.io.UnsupportedEncodingException uee )
-        {
-            bytes = s.getBytes();
-        }   // end catch
-		//</change>
-        
-        // Decode
-        bytes = decode( bytes, 0, bytes.length, options );
-        
-        
-        // Check to see if it's gzip-compressed
-        // GZIP Magic Two-Byte Number: 0x8b1f (35615)
-        if( bytes != null && bytes.length >= 4 )
-        {
-            
-            int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);       
-            if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head ) 
-            {
-                java.io.ByteArrayInputStream  bais = null;
-                java.util.zip.GZIPInputStream gzis = null;
-                java.io.ByteArrayOutputStream baos = null;
-                byte[] buffer = new byte[2048];
-                int    length;
-
-                try
-                {
-                    baos = new java.io.ByteArrayOutputStream();
-                    bais = new java.io.ByteArrayInputStream( bytes );
-                    gzis = new java.util.zip.GZIPInputStream( bais );
-
-                    while( ( length = gzis.read( buffer ) ) >= 0 )
-                    {
-                        baos.write(buffer,0,length);
-                    }   // end while: reading input
-
-                    // No error? Get new bytes.
-                    bytes = baos.toByteArray();
-
-                }   // end try
-                catch( java.io.IOException e )
-                {
-                    // Just return originally-decoded bytes
-                }   // end catch
-                finally
-                {
-                    try{ baos.close(); } catch( Exception e ){ /* empty */ }
-                    try{ gzis.close(); } catch( Exception e ){ /* empty */ }
-                    try{ bais.close(); } catch( Exception e ){ /* empty */ }
-                }   // end finally
-
-            }   // end if: gzipped
-        }   // end if: bytes.length >= 2
-        
-        return bytes;
-    }   // end decode
-
-
-    
-
-    /**
-     * Attempts to decode Base64 data and deserialize a Java
-     * Object within. Returns <tt>null</tt> if there was an error.
-     *
-     * @param encodedObject The Base64 data to decode
-     * @return The decoded and deserialized object
-     * @since 1.5
-     */
-    public static Object decodeToObject( String encodedObject )
-    {
-        // Decode and gunzip if necessary
-        byte[] objBytes = decode( encodedObject );
-        
-        java.io.ByteArrayInputStream  bais = null;
-        java.io.ObjectInputStream     ois  = null;
-        Object obj = null;
-        
-        try
-        {
-            bais = new java.io.ByteArrayInputStream( objBytes );
-            ois  = new java.io.ObjectInputStream( bais );
-        
-            obj = ois.readObject();
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            e.printStackTrace();
-            obj = null;
-        }   // end catch
-        catch( java.lang.ClassNotFoundException e )
-        {
-            e.printStackTrace();
-            obj = null;
-        }   // end catch
-        finally
-        {
-            if (bais!=null)
-                try{ bais.close(); } catch( Exception e ){ /* empty */ }
-            if (ois!=null)
-                try{ ois.close();  } catch( Exception e ){ /* empty */ }
-        }   // end finally
-        
-        return obj;
-    }   // end decodeObject
-    
-    
-    
-    /**
-     * Convenience method for encoding data to a file.
-     *
-     * @param dataToEncode byte array of data to encode in base64 form
-     * @param filename Filename for saving encoded data
-     * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
-     *
-     * @since 2.1
-     */
-    public static boolean encodeToFile( byte[] dataToEncode, String filename )
-    {
-        boolean success = false;
-        Base64.OutputStream bos = null;
-        try
-        {
-            bos = new Base64.OutputStream( 
-                      new java.io.FileOutputStream( filename ), Base64.ENCODE );
-            bos.write( dataToEncode );
-            success = true;
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            
-            success = false;
-        }   // end catch: IOException
-        finally
-        {
-            if (bos!=null)
-                try{ bos.close(); } catch( Exception e ){ /* empty */ }
-        }   // end finally
-        
-        return success;
-    }   // end encodeToFile
-    
-    
-    /**
-     * Convenience method for decoding data to a file.
-     *
-     * @param dataToDecode Base64-encoded data as a string
-     * @param filename Filename for saving decoded data
-     * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
-     *
-     * @since 2.1
-     */
-    public static boolean decodeToFile( String dataToDecode, String filename )
-    {
-        boolean success = false;
-        Base64.OutputStream bos = null;
-        try
-        {
-                bos = new Base64.OutputStream( 
-                          new java.io.FileOutputStream( filename ), Base64.DECODE );
-                bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
-                success = true;
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            success = false;
-        }   // end catch: IOException
-        finally
-        {
-            if (bos!=null)
-                try{ bos.close(); } catch( Exception e ){ /* empty */ }
-        }   // end finally
-        
-        return success;
-    }   // end decodeToFile
-    
-    
-    
-    
-    /**
-     * Convenience method for reading a base64-encoded
-     * file and decoding it.
-     *
-     * @param filename Filename for reading encoded data
-     * @return decoded byte array or null if unsuccessful
-     *
-     * @since 2.1
-     */
-    public static byte[] decodeFromFile( String filename )
-    {
-        byte[] decodedData = null;
-        Base64.InputStream bis = null;
-        try
-        {
-            // Set up some useful variables
-            java.io.File file = new java.io.File( filename );
-            byte[] buffer;
-            int length   = 0;
-            int numBytes;
-            
-            // Check for size of file
-            if( file.length() > Integer.MAX_VALUE )
-            {
-                System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
-                return null;
-            }   // end if: file too big for int index
-            buffer = new byte[ (int)file.length() ];
-            
-            // Open a stream
-            bis = new Base64.InputStream( 
-                      new java.io.BufferedInputStream( 
-                      new java.io.FileInputStream( file ) ), Base64.DECODE );
-            
-            // Read until done
-            while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
-                length += numBytes;
-            
-            // Save in a variable to return
-            decodedData = new byte[ length ];
-            System.arraycopy( buffer, 0, decodedData, 0, length );
-            
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            System.err.println( "Error decoding from file " + filename );
-        }   // end catch: IOException
-        finally
-        {
-            if (bis!=null)
-                try{ bis.close(); } catch( Exception e) { /* empty */ }
-        }   // end finally
-        
-        return decodedData;
-    }   // end decodeFromFile
-    
-    
-    
-    /**
-     * Convenience method for reading a binary file
-     * and base64-encoding it.
-     *
-     * @param filename Filename for reading binary data
-     * @return base64-encoded string or null if unsuccessful
-     *
-     * @since 2.1
-     */
-    public static String encodeFromFile( String filename )
-    {
-        String encodedData = null;
-        Base64.InputStream bis = null;
-        try
-        {
-            // Set up some useful variables
-            java.io.File file = new java.io.File( filename );
-            byte[] buffer = new byte[ Math.max((int)(file.length() * 1.4),40) ]; // Need max() for math on small files (v2.2.1)
-            int length   = 0;
-            int numBytes;
-            
-            // Open a stream
-            bis = new Base64.InputStream( 
-                      new java.io.BufferedInputStream( 
-                      new java.io.FileInputStream( file ) ), Base64.ENCODE );
-            
-            // Read until done
-            while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
-                length += numBytes;
-            
-            // Save in a variable to return
-            encodedData = new String( buffer, 0, length, Base64.PREFERRED_ENCODING );
-                
-        }   // end try
-        catch( java.io.IOException e )
-        {
-            System.err.println( "Error encoding from file " + filename );
-        }   // end catch: IOException
-        finally
-        {
-            if (bis!=null)
-                try{ bis.close(); } catch( Exception e) { /* empty */ }
-        }   // end finally
-        
-        return encodedData;
-        }   // end encodeFromFile
-    
-    /**
-     * Reads <tt>infile</tt> and encodes it to <tt>outfile</tt>.
-     *
-     * @param infile Input file
-     * @param outfile Output file
-     * @since 2.2
-     */
-    public static void encodeFileToFile( String infile, String outfile )
-    {
-        String encoded = Base64.encodeFromFile( infile );
-        java.io.OutputStream out = null;
-        try{
-            out = new java.io.BufferedOutputStream(
-                  new java.io.FileOutputStream( outfile ) );
-            out.write( encoded.getBytes("US-ASCII") ); // Strict, 7-bit output.
-        }   // end try
-        catch( java.io.IOException ex ) {
-            ex.printStackTrace();
-        }   // end catch
-        finally {
-            if (out!=null)
-                try { out.close(); }
-                    catch( Exception ex ){ /* empty */ }
-        }   // end finally    
-    }   // end encodeFileToFile
-
-
-    /**
-     * Reads <tt>infile</tt> and decodes it to <tt>outfile</tt>.
-     *
-     * @param infile Input file
-     * @param outfile Output file
-     * @since 2.2
-     */
-    public static void decodeFileToFile( String infile, String outfile )
-    {
-        byte[] decoded = Base64.decodeFromFile( infile );
-        java.io.OutputStream out = null;
-        try{
-            out = new java.io.BufferedOutputStream(
-                  new java.io.FileOutputStream( outfile ) );
-            out.write( decoded );
-        }   // end try
-        catch( java.io.IOException ex ) {
-            ex.printStackTrace();
-        }   // end catch
-        finally {
-            if (out!=null)
-                try { out.close(); }
-                    catch( Exception ex ){ /* empty */ }
-        }   // end finally    
-    }   // end decodeFileToFile
-    
-    
-    /* ********  I N N E R   C L A S S   I N P U T S T R E A M  ******** */
-    
-    
-    
-    /**
-     * A {@link Base64.InputStream} will read data from another
-     * <tt>java.io.InputStream</tt>, given in the constructor,
-     * and encode/decode to/from Base64 notation on the fly.
-     *
-     * @see Base64
-     * @since 1.3
-     */
-    public static class InputStream extends java.io.FilterInputStream
-    {
-        private boolean encode;         // Encoding or decoding
-        private int     position;       // Current position in the buffer
-        private byte[]  buffer;         // Small buffer holding converted data
-        private int     bufferLength;   // Length of buffer (3 or 4)
-        private int     numSigBytes;    // Number of meaningful bytes in the buffer
-        private int     lineLength;
-        private boolean breakLines;     // Break lines at less than 80 characters
-		private int     options;        // Record options used to create the stream.
-		@SuppressWarnings("unused")
-		private byte[]  alphabet;	    // Local copies to avoid extra method calls
-		private byte[]  decodabet;		// Local copies to avoid extra method calls
-        
-        
-        /**
-         * Constructs a {@link Base64.InputStream} in DECODE mode.
-         *
-         * @param in the <tt>java.io.InputStream</tt> from which to read data.
-         * @since 1.3
-         */
-        public InputStream( java.io.InputStream in )
-        {   
-            this( in, DECODE );
-        }   // end constructor
-        
-        
-        /**
-         * Constructs a {@link Base64.InputStream} in
-         * either ENCODE or DECODE mode.
-         * <p>
-         * Valid options:<pre>
-         *   ENCODE or DECODE: Encode or Decode as data is read.
-         *   DONT_BREAK_LINES: don't break lines at 76 characters
-         *     (only meaningful when encoding)
-         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
-         * </pre>
-         * <p>
-         * Example: <code>new Base64.InputStream( in, Base64.DECODE )</code>
-         *
-         *
-         * @param in the <tt>java.io.InputStream</tt> from which to read data.
-         * @param options Specified options
-         * @see Base64#ENCODE
-         * @see Base64#DECODE
-         * @see Base64#DONT_BREAK_LINES
-         * @since 2.0
-         */
-        public InputStream( java.io.InputStream in, int options )
-        {   
-            super( in );
-            this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
-            this.encode       = (options & ENCODE) == ENCODE;
-            this.bufferLength = encode ? 4 : 3;
-            this.buffer       = new byte[ bufferLength ];
-            this.position     = -1;
-            this.lineLength   = 0;
-			this.options      = options; // Record for later, mostly to determine which alphabet to use
-			this.alphabet     = getAlphabet(options);
-			this.decodabet    = getDecodabet(options);
-        }   // end constructor
-        
-        /**
-         * Reads enough of the input stream to convert
-         * to/from Base64 and returns the next byte.
-         *
-         * @return next byte
-         * @since 1.3
-         */
-        public int read() throws java.io.IOException 
-        { 
-            // Do we need to get data?
-            if( position < 0 )
-            {
-                if( encode )
-                {
-                    byte[] b3 = new byte[3];
-                    int numBinaryBytes = 0;
-                    for( int i = 0; i < 3; i++ )
-                    {
-                        try
-                        { 
-                            int b = in.read();
-                            
-                            // If end of stream, b is -1.
-                            if( b >= 0 )
-                            {
-                                b3[i] = (byte)b;
-                                numBinaryBytes++;
-                            }   // end if: not end of stream
-                            
-                        }   // end try: read
-                        catch( java.io.IOException e )
-                        {   
-                            // Only a problem if we got no data at all.
-                            if( i == 0 )
-                                throw e;
-                            
-                        }   // end catch
-                    }   // end for: each needed input byte
-                    
-                    if( numBinaryBytes > 0 )
-                    {
-                        encode3to4( b3, 0, numBinaryBytes, buffer, 0, options );
-                        position = 0;
-                        numSigBytes = 4;
-                    }   // end if: got data
-                    else
-                    {
-                        return -1;
-                    }   // end else
-                }   // end if: encoding
-                
-                // Else decoding
-                else
-                {
-                    byte[] b4 = new byte[4];
-                    int i;
-                    for( i = 0; i < 4; i++ )
-                    {
-                        // Read four "meaningful" bytes:
-                        int b;
-                        do{ b = in.read(); }
-                        while( b >= 0 && decodabet[ b & 0x7f ] <= WHITE_SPACE_ENC );
-                        
-                        if( b < 0 )
-                            break; // Reads a -1 if end of stream
-                        
-                        b4[i] = (byte)b;
-                    }   // end for: each needed input byte
-                    
-                    if( i == 4 )
-                    {
-                        numSigBytes = decode4to3( b4, 0, buffer, 0, options );
-                        position = 0;
-                    }   // end if: got four characters
-                    else if( i == 0 ){
-                        return -1;
-                    }   // end else if: also padded correctly
-                    else
-                    {
-                        // Must have broken out from above.
-                        throw new java.io.IOException( "Improperly padded Base64 input." );
-                    }   // end 
-                    
-                }   // end else: decode
-            }   // end else: get data
-            
-            // Got data?
-            if( position >= 0 )
-            {
-                // End of relevant data?
-                if( /*!encode &&*/ position >= numSigBytes )
-                    return -1;
-                
-                if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
-                {
-                    lineLength = 0;
-                    return '\n';
-                }   // end if
-                else
-                {
-                    lineLength++;   // This isn't important when decoding
-                                    // but throwing an extra "if" seems
-                                    // just as wasteful.
-                    
-                    int b = buffer[ position++ ];
-
-                    if( position >= bufferLength )
-                        position = -1;
-
-                    return b & 0xFF; // This is how you "cast" a byte that's
-                                     // intended to be unsigned.
-                }   // end else
-            }   // end if: position >= 0
-            
-            // Else error
-            else
-            {   
-                // When JDK1.4 is more accepted, use an assertion here.
-                throw new java.io.IOException( "Error in Base64 code reading stream." );
-            }   // end else
-        }   // end read
-        
-        
-        /**
-         * Calls {@link #read()} repeatedly until the end of stream
-         * is reached or <var>len</var> bytes are read.
-         * Returns number of bytes read into array or -1 if
-         * end of stream is encountered.
-         *
-         * @param dest array to hold values
-         * @param off offset for array
-         * @param len max number of bytes to read into array
-         * @return bytes read into array or -1 if end of stream is encountered.
-         * @since 1.3
-         */
-        public int read( byte[] dest, int off, int len ) throws java.io.IOException
-        {
-            int i;
-            int b;
-            for( i = 0; i < len; i++ )
-            {
-                b = read();
-                
-                //if( b < 0 && i == 0 )
-                //    return -1;
-                
-                if( b >= 0 )
-                    dest[off + i] = (byte)b;
-                else if( i == 0 )
-                    return -1;
-                else
-                    break; // Out of 'for' loop
-            }   // end for: each byte read
-            return i;
-        }   // end read
-        
-    }   // end inner class InputStream
-    
-    
-    
-    
-    
-    
-    /* ********  I N N E R   C L A S S   O U T P U T S T R E A M  ******** */
-    
-    
-    
-    /**
-     * A {@link Base64.OutputStream} will write data to another
-     * <tt>java.io.OutputStream</tt>, given in the constructor,
-     * and encode/decode to/from Base64 notation on the fly.
-     *
-     * @see Base64
-     * @since 1.3
-     */
-    public static class OutputStream extends java.io.FilterOutputStream
-    {
-        private boolean encode;
-        private int     position;
-        private byte[]  buffer;
-        private int     bufferLength;
-        private int     lineLength;
-        private boolean breakLines;
-        private byte[]  b4; // Scratch used in a few places
-        private boolean suspendEncoding;
-		private int options; // Record for later
-		@SuppressWarnings("unused")
-		private byte[]  alphabet;	    // Local copies to avoid extra method calls
-		private byte[]  decodabet;		// Local copies to avoid extra method calls
-        
-        /**
-         * Constructs a {@link Base64.OutputStream} in ENCODE mode.
-         *
-         * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
-         * @since 1.3
-         */
-        public OutputStream( java.io.OutputStream out )
-        {   
-            this( out, ENCODE );
-        }   // end constructor
-        
-        
-        /**
-         * Constructs a {@link Base64.OutputStream} in
-         * either ENCODE or DECODE mode.
-         * <p>
-         * Valid options:<pre>
-         *   ENCODE or DECODE: Encode or Decode as data is read.
-         *   DONT_BREAK_LINES: don't break lines at 76 characters
-         *     (only meaningful when encoding)
-         *     <i>Note: Technically, this makes your encoding non-compliant.</i>
-         * </pre>
-         * <p>
-         * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
-         *
-         * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
-         * @param options Specified options.
-         * @see Base64#ENCODE
-         * @see Base64#DECODE
-         * @see Base64#DONT_BREAK_LINES
-         * @since 1.3
-         */
-        public OutputStream( java.io.OutputStream out, int options )
-        {   
-            super( out );
-            this.breakLines   = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
-            this.encode       = (options & ENCODE) == ENCODE;
-            this.bufferLength = encode ? 3 : 4;
-            this.buffer       = new byte[ bufferLength ];
-            this.position     = 0;
-            this.lineLength   = 0;
-            this.suspendEncoding = false;
-            this.b4           = new byte[4];
-			this.options      = options;
-			this.alphabet     = getAlphabet(options);
-			this.decodabet    = getDecodabet(options);
-        }   // end constructor
-        
-        
-        /**
-         * Writes the byte to the output stream after
-         * converting to/from Base64 notation.
-         * When encoding, bytes are buffered three
-         * at a time before the output stream actually
-         * gets a write() call.
-         * When decoding, bytes are buffered four
-         * at a time.
-         *
-         * @param theByte the byte to write
-         * @since 1.3
-         */
-        public void write(int theByte) throws java.io.IOException
-        {
-            // Encoding suspended?
-            if( suspendEncoding )
-            {
-                super.out.write( theByte );
-                return;
-            }   // end if: supsended
-            
-            // Encode?
-            if( encode )
-            {
-                buffer[ position++ ] = (byte)theByte;
-                if( position >= bufferLength )  // Enough to encode.
-                {
-                    out.write( encode3to4( b4, buffer, bufferLength, options ) );
-
-                    lineLength += 4;
-                    if( breakLines && lineLength >= MAX_LINE_LENGTH )
-                    {
-                        out.write( NEW_LINE );
-                        lineLength = 0;
-                    }   // end if: end of line
-
-                    position = 0;
-                }   // end if: enough to output
-            }   // end if: encoding
-
-            // Else, Decoding
-            else
-            {
-                // Meaningful Base64 character?
-                if( decodabet[ theByte & 0x7f ] > WHITE_SPACE_ENC )
-                {
-                    buffer[ position++ ] = (byte)theByte;
-                    if( position >= bufferLength )  // Enough to output.
-                    {
-                        int len = Base64.decode4to3( buffer, 0, b4, 0, options );
-                        out.write( b4, 0, len );
-                        //out.write( Base64.decode4to3( buffer ) );
-                        position = 0;
-                    }   // end if: enough to output
-                }   // end if: meaningful base64 character
-                else if( decodabet[ theByte & 0x7f ] != WHITE_SPACE_ENC )
-                {
-                    throw new java.io.IOException( "Invalid character in Base64 data." );
-                }   // end else: not white space either
-            }   // end else: decoding
-        }   // end write
-        
-        
-        
-        /**
-         * Calls {@link #write(int)} repeatedly until <var>len</var> 
-         * bytes are written.
-         *
-         * @param theBytes array from which to read bytes
-         * @param off offset for array
-         * @param len max number of bytes to read into array
-         * @since 1.3
-         */
-        public void write( byte[] theBytes, int off, int len ) throws java.io.IOException
-        {
-            // Encoding suspended?
-            if( suspendEncoding )
-            {
-                super.out.write( theBytes, off, len );
-                return;
-            }   // end if: supsended
-            
-            for( int i = 0; i < len; i++ )
-            {
-                write( theBytes[ off + i ] );
-            }   // end for: each byte written
-            
-        }   // end write
-        
-        
-        
-        /**
-         * Method added by PHIL. [Thanks, PHIL. -Rob]
-         * This pads the buffer without closing the stream.
-         */
-        public void flushBase64() throws java.io.IOException 
-        {
-            if( position > 0 )
-            {
-                if( encode )
-                {
-                    out.write( encode3to4( b4, buffer, position, options ) );
-                    position = 0;
-                }   // end if: encoding
-                else
-                {
-                    throw new java.io.IOException( "Base64 input not properly padded." );
-                }   // end else: decoding
-            }   // end if: buffer partially full
-
-        }   // end flush
-
-        
-        /** 
-         * Flushes and closes (I think, in the superclass) the stream. 
-         *
-         * @since 1.3
-         */
-        public void close() throws java.io.IOException
-        {
-            // 1. Ensure that pending characters are written
-            flushBase64();
-
-            // 2. Actually close the stream
-            // Base class both flushes and closes.
-            super.close();
-            
-            buffer = null;
-            out    = null;
-        }   // end close
-        
-        
-        
-        /**
-         * Suspends encoding of the stream.
-         * May be helpful if you need to embed a piece of
-         * base640-encoded data in a stream.
-         *
-         * @since 1.5.1
-         */
-        public void suspendEncoding() throws java.io.IOException 
-        {
-            flushBase64();
-            this.suspendEncoding = true;
-        }   // end suspendEncoding
-        
-        
-        /**
-         * Resumes encoding of the stream.
-         * May be helpful if you need to embed a piece of
-         * base640-encoded data in a stream.
-         *
-         * @since 1.5.1
-         */
-        public void resumeEncoding()
-        {
-            this.suspendEncoding = false;
-        }   // end resumeEncoding
-        
-        
-        
-    }   // end inner class OutputStream
-    
-    
-}   // end class Base64