Author: snjeza
Date: 2011-11-30 08:39:40 -0500 (Wed, 30 Nov 2011)
New Revision: 36779
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java
Log:
JBIDE-10284 JBoss AS 7 quickstarts and JBoss AS 7.1
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
===================================================================
---
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-11-30
13:27:33 UTC (rev 36778)
+++
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-11-30
13:39:40 UTC (rev 36779)
@@ -50,8 +50,8 @@
<
url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas...
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -95,8 +95,8 @@
<
url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas...
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -136,8 +136,8 @@
<
url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas...
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -177,8 +177,8 @@
<
url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas...
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -219,8 +219,8 @@
<
url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas...
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
@@ -261,8 +261,8 @@
<url/>
<fixes>
<fix type="wtpruntime">
- <property
name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
- <property name="description">This project example requires JBoss AS
7.0</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70,
org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">This project example requires JBoss AS
7.0/7.1</property>
<property
name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-11-30
13:27:33 UTC (rev 36778)
+++
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-11-30
13:39:40 UTC (rev 36779)
@@ -107,35 +107,7 @@
ret[0] = false;
}
}
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project != null && project.isAccessible()) {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- } catch (CoreException e) {
- // ignore
- }
- }
- if (includedProjects.size() > 0) {
- IProject[] selectedProjects = new IProject[includedProjects.size()];
- int i = 0;
-
- for (String selectedProjectName:includedProjects) {
- project =
ResourcesPlugin.getWorkspace().getRoot().getProject(selectedProjectName);
- selectedProjects[i++] = project;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- } catch (CoreException e) {
- // ignore
- }
- }
- Job updateJob = new UpdateConfigurationJob(selectedProjects , true, false);
- updateJob.schedule();
- try {
- updateJob.join();
- } catch (InterruptedException e) {
- // ignore
- }
- }
+ MavenProjectExamplesActivator.updateMavenConfiguration(projectName, includedProjects,
monitor);
}
});
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-11-30
13:27:33 UTC (rev 36778)
+++
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-11-30
13:39:40 UTC (rev 36779)
@@ -116,8 +116,10 @@
List<String> projectNames = importMavenProjects(destination, projectDescription,
monitor);
new OpenMavenConsoleAction().run();
- projectDescription.getIncludedProjects().clear();
+ List<String> includedProjects = projectDescription.getIncludedProjects();
+ includedProjects.clear();
projectDescription.getIncludedProjects().addAll(projectNames);
+ MavenProjectExamplesActivator.updateMavenConfiguration(projectName, includedProjects,
monitor);
return true;
}
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30
13:27:33 UTC (rev 36778)
+++
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30
13:39:40 UTC (rev 36779)
@@ -1,20 +1,25 @@
package org.jboss.tools.maven.project.examples;
import java.io.File;
+import java.util.List;
import org.apache.maven.model.Model;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.m2e.core.project.MavenProjectInfo;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
+import org.eclipse.m2e.core.ui.internal.UpdateConfigurationJob;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -108,4 +113,36 @@
public static ImageDescriptor getNewWizardImageDescriptor() {
return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID,
"icons/new_wiz.png");
}
+
+ public static void updateMavenConfiguration(String projectName, List<String>
includedProjects,final IProgressMonitor monitor) {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ if (project != null && project.isAccessible()) {
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+ if (includedProjects.size() > 0) {
+ IProject[] selectedProjects = new IProject[includedProjects.size()];
+ int i = 0;
+
+ for (String selectedProjectName:includedProjects) {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(selectedProjectName);
+ selectedProjects[i++] = project;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+ Job updateJob = new UpdateConfigurationJob(selectedProjects , true, false);
+ updateJob.schedule();
+ try {
+ updateJob.join();
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+ }
}