Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
clean up import messes
Browse files Browse the repository at this point in the history
  • Loading branch information
@timf
timf committed Jul 6, 2010
1 parent ecefdfa commit a966078
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 117 deletions.
25 changes: 11 additions & 14 deletions service/client/java/source/src/org/globus/workspace/cloud/client/util/CloudClientUtil.java
View file
Expand Up @@ -18,41 +18,38 @@

import org.apache.axis.message.addressing.EndpointReferenceType;
import org.apache.axis.types.URI;
import org.globus.gsi.GlobusCredential;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.client_core.ParameterProblem;
import org.globus.workspace.client_core.repr.Workspace;
import org.globus.workspace.client_core.utils.EPRUtils;
import org.globus.workspace.client_core.utils.StringUtils;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.common.print.Print;
import org.globus.wsrf.encoding.DeserializationException;
import org.globus.wsrf.encoding.ObjectDeserializer;
import org.xml.sax.InputSource;
import org.nimbustools.messaging.gt4_0.generated.metadata.VirtualWorkspace_Type;
import org.nimbustools.messaging.gt4_0.generated.metadata.definition.BoundDisk_Type;
import org.nimbustools.messaging.gt4_0.generated.metadata.definition.Definition;
import org.nimbustools.messaging.gt4_0.generated.metadata.definition.DiskCollection_Type;
import org.nimbustools.messaging.gt4_0.generated.metadata.definition.BoundDisk_Type;
import org.xml.sax.InputSource;

import org.globus.gsi.GlobusCredential;
import java.io.File;
import java.io.PrintStream;
import java.io.FilenameFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.net.URL;
import java.io.FilenameFilter;
import java.io.PrintStream;
import java.net.MalformedURLException;
import java.util.Properties;
import java.util.Hashtable;
import java.util.Enumeration;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;

import org.globus.workspace.cloud.client.Props;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.common.print.Print;

public class CloudClientUtil {

public static final String credURL =
Expand Down
40 changes: 4 additions & 36 deletions .../client/java/source/src/org/globus/workspace/cloud/client/util/CumulusRepositoryUtil.java
View file
Expand Up @@ -16,49 +16,17 @@

package org.globus.workspace.cloud.client.util;

import org.globus.ftp.GridFTPClient;
import org.globus.ftp.Session;
import org.globus.ftp.MlsxEntry;
import org.globus.ftp.exception.ServerException;
import org.globus.util.GlobusURL;
import org.globus.gsi.gssapi.auth.HostAuthorization;
import org.globus.gsi.gssapi.auth.IdentityAuthorization;
import org.globus.gsi.gssapi.auth.Authorization;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.cloud.client.tasks.CopyTask;
import org.globus.workspace.cloud.client.tasks.CopyWatchTask;
import org.globus.io.urlcopy.UrlCopy;

import java.io.PrintStream;
import java.io.IOException;
import java.util.Vector;
import java.util.Date;
import java.util.ArrayList;
import java.io.File;
import java.util.Calendar;

import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.client_core.ParameterProblem;

import org.globus.workspace.common.SecurityUtil;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.cloud.client.Opts;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.common.print.Print;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;

import org.jets3t.service.*;
import org.jets3t.service.security.*;
import org.jets3t.service.model.*;
import org.jets3t.service.impl.rest.httpclient.RestS3Service;
import org.jets3t.service.model.S3Object;
import org.jets3t.service.S3ServiceException;
import org.globus.workspace.cloud.client.Props;
import java.util.Properties;
import java.io.PrintStream;

public class CumulusRepositoryUtil
implements RepositoryInterface {
Expand Down
57 changes: 15 additions & 42 deletions service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusTask.java
View file
Expand Up @@ -16,54 +16,27 @@

package org.globus.workspace.cloud.client.util;

import org.globus.ftp.GridFTPClient;
import org.globus.ftp.Session;
import org.globus.ftp.MlsxEntry;
import org.globus.ftp.exception.ServerException;
import org.globus.util.GlobusURL;
import org.globus.gsi.gssapi.auth.HostAuthorization;
import org.globus.gsi.gssapi.auth.IdentityAuthorization;
import org.globus.gsi.gssapi.auth.Authorization;
import edu.emory.mathcs.backport.java.util.concurrent.Callable;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.cloud.client.tasks.CopyTask;
import org.globus.workspace.cloud.client.tasks.CopyWatchTask;
import org.globus.io.urlcopy.UrlCopy;

import java.io.PrintStream;
import java.io.IOException;
import java.util.Vector;
import java.util.Date;
import java.util.ArrayList;
import java.io.File;
import java.io.InputStream;
import java.io.FileOutputStream;
import java.util.Calendar;

import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import org.globus.workspace.client_core.ParameterProblem;

import org.globus.workspace.common.SecurityUtil;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.cloud.client.Opts;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.common.print.Print;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;

import org.jets3t.service.*;
import org.jets3t.service.security.*;
import org.jets3t.service.model.*;
import org.jets3t.service.Jets3tProperties;
import org.jets3t.service.S3Service;
import org.jets3t.service.S3ServiceException;
import org.jets3t.service.impl.rest.httpclient.RestS3Service;
import org.jets3t.service.io.BytesProgressWatcher;
import org.jets3t.service.model.S3Object;
import org.jets3t.service.S3ServiceException;

import edu.emory.mathcs.backport.java.util.concurrent.Callable;
import org.jets3t.service.security.AWSCredentials;
import org.jets3t.service.utils.Mimetypes;
import org.jets3t.service.utils.ObjectUtils;
import org.jets3t.service.io.BytesProgressWatcher;
import org.jets3t.service.utils.Mimetypes;;

import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;

class CumulusInputStream
extends InputStream
Expand Down
40 changes: 17 additions & 23 deletions .../client/java/source/src/org/globus/workspace/cloud/client/util/GridFTPRepositoryUtil.java
View file
Expand Up @@ -16,40 +16,34 @@

package org.globus.workspace.cloud.client.util;

import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
import org.globus.ftp.GridFTPClient;
import org.globus.ftp.Session;
import org.globus.ftp.MlsxEntry;
import org.globus.ftp.Session;
import org.globus.ftp.exception.ServerException;
import org.globus.util.GlobusURL;
import org.globus.gsi.gssapi.auth.Authorization;
import org.globus.gsi.gssapi.auth.HostAuthorization;
import org.globus.gsi.gssapi.auth.IdentityAuthorization;
import org.globus.gsi.gssapi.auth.Authorization;
import org.globus.io.urlcopy.UrlCopy;
import org.globus.util.GlobusURL;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.client_core.ParameterProblem;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.cloud.client.Opts;
import org.globus.workspace.cloud.client.tasks.CopyTask;
import org.globus.workspace.cloud.client.tasks.CopyWatchTask;
import org.globus.io.urlcopy.UrlCopy;
import org.globus.workspace.common.SecurityUtil;
import org.globus.workspace.common.print.Print;

import java.io.PrintStream;
import java.io.File;
import java.io.IOException;
import java.util.Vector;
import java.io.PrintStream;
import java.util.ArrayList;
import java.io.File;

import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import org.globus.workspace.client_core.ParameterProblem;

import org.globus.workspace.common.SecurityUtil;
import org.globus.workspace.cloud.client.AllArgs;
import org.globus.workspace.cloud.client.Opts;
import org.globus.workspace.client_core.ExecutionProblem;
import org.globus.workspace.common.print.Print;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import org.globus.workspace.cloud.client.Props;
import java.util.Properties;
import java.util.Vector;

public class GridFTPRepositoryUtil
implements RepositoryInterface {
Expand Down
5 changes: 4 additions & 1 deletion service/client/java/source/src/org/globus/workspace/cloud/meta/client/AllArgs.java
View file
Expand Up @@ -27,10 +27,13 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
import java.util.EnumSet;
import java.util.Properties;
import java.io.*;

public class AllArgs {

Expand Down
6 changes: 5 additions & 1 deletion service/client/java/source/src/org/globus/workspace/cloud/meta/client/CloudMetaClient.java
View file
Expand Up @@ -38,10 +38,14 @@
import org.nimbustools.ctxbroker.generated.gt4_0.description.Cloudworkspace_Type;
import org.nimbustools.messaging.gt4_0.common.CommonUtil;

import java.util.*;
import java.io.IOException;
import java.io.PrintStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;

public class CloudMetaClient {

Expand Down

0 comments on commit a966078

Please sign in to comment.