Author: adietish Date: 2011-12-07 13:44:25 -0500 (Wed, 07 Dec 2011) New Revision: 37075 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java Log: [JBIDE-10402] cloning OpenShift application to temporary folder and removing it afterwards Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java 2011-12-07 18:25:21 UTC (rev 37074) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java 2011-12-07 18:44:25 UTC (rev 37075) @@ -52,6 +52,16 @@ && file.isDirectory(); } + public static File getSystemTmpFolder() { + String tmpFolder = System.getProperty("java.io.tmpdir"); + return new File(tmpFolder); + } + + public static File getRandomTmpFolder() { + String randomName = String.valueOf(System.currentTimeMillis()); + return new File(getSystemTmpFolder(), randomName); + } + /** * Copies the ginve source to the given destination recursively. Overwrites * existing files/directory on the destination path if told so. Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 18:25:21 UTC (rev 37074) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 18:44:25 UTC (rev 37075) @@ -287,11 +287,15 @@ // model.shareProject(monitor); // model.mergeWithApplicationRepository(repository, // monitor); - File repositoryFile = cloneRepository(monitor); + File tmpFolder = FileUtils.getRandomTmpFolder(); + File repositoryFile = cloneRepository(tmpFolder, monitor); + tmpFolder.delete(); + copyOpenshiftConfiguration(repositoryFile, monitor); shareProject(monitor); createServerAdapterIfRequired(monitor); } + public void mergeWithApplicationRepository(Repository repository, IProgressMonitor monitor) throws MalformedURLException, URISyntaxException, IOException, OpenShiftException, CoreException, @@ -350,8 +354,14 @@ private File cloneRepository(IProgressMonitor monitor) throws OpenShiftException, InvocationTargetException, InterruptedException, URISyntaxException { IApplication application = getApplication(); + File destination = new File(getRepositoryPath(), application.getName()); + return cloneRepository(destination, monitor); + } + + private File cloneRepository(File destination, IProgressMonitor monitor) + throws OpenShiftException, InvocationTargetException, InterruptedException, URISyntaxException { + IApplication application = getApplication(); monitor.subTask(NLS.bind("Cloning repository for application {0}...", application.getName())); - File destination = new File(getRepositoryPath(), application.getName()); cloneRepository(application.getGitUri(), destination, monitor); return destination; }