Author: fbricon Date: 2012-04-27 20:29:13 -0400 (Fri, 27 Apr 2012) New Revision: 40605 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java Log: JBIDE-11702 : .gitignore cannot exclude .jsdtscope nor factorypath by default Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-04-28 00:01:33 UTC (rev 40604) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-04-28 00:29:13 UTC (rev 40605) @@ -217,10 +217,10 @@ protected IFile setupGitIgnore(IProject project, IProgressMonitor monitor) throws IOException, CoreException { GitIgnore gitIgnore = new GitIgnore(project); gitIgnore.add("target") - .add(".settings") + .add(".settings/*") + .add("!.settings/.jsdtscope")//To prevent nasty JSDT bugs .add(".project") - .add(".classpath") - .add(".factorypath"); + .add(".classpath"); return gitIgnore.write(monitor); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-04-28 00:01:33 UTC (rev 40604) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-04-28 00:29:13 UTC (rev 40605) @@ -94,7 +94,7 @@ IProject project = getProject(); copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor); - createGitIgnore(project, monitor); + setupGitIgnore(project, monitor); setupOpenShiftMavenProfile(project, monitor); shareProject(project, monitor); addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project)); @@ -150,25 +150,6 @@ } - /** - * Adds a predefined set of entries to the gitignore file in (root of) the - * given project. If no .gitignore exists yet, a fresh one is created. - * - * @param project - * the project to which the .gitignore shall be configured - * @throws IOException - * @throws CoreException - */ - private void createGitIgnore(IProject project, IProgressMonitor monitor) throws IOException, CoreException { - GitIgnore gitIgnore = new GitIgnore(project); - gitIgnore.add("target") - .add(".settings") - .add(".project") - .add(".classpath") - .add(".factorypath"); - gitIgnore.write(monitor); - } - // private void mergeWithApplicationRepository(Repository repository, // IApplication application, // IProgressMonitor monitor)