Author: simoneg
Date: Mon Oct 5 21:38:27 2009
New Revision: 822032
URL: http://svn.apache.org/viewvc?rev=822032&view=rev
Log:
LABS-398 : setup linked sources in the builder, to avoid triggering endless
builds
Removed:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaMavenListener.java
Modified:
labs/magma/trunk/magma-eclipse/plugin.xml
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/Activator.java
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/MagmaBuilder.java
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Modified: labs/magma/trunk/magma-eclipse/plugin.xml
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/plugin.xml?rev=822032&r1=822031&r2=822032&view=diff
==============================================================================
--- labs/magma/trunk/magma-eclipse/plugin.xml (original)
+++ labs/magma/trunk/magma-eclipse/plugin.xml Mon Oct 5 21:38:27 2009
@@ -421,14 +421,6 @@
</shortcut>
</extension>
<extension
- point="org.maven.ide.eclipse.projectConfigurators">
- <configurator
-
class="org.apache.magma.tools.magmaeclipse.basics.MagmaMavenListener"
- id="magma-eclipse.configurator1"
- name="Magma">
- </configurator>
- </extension>
- <extension
point="org.eclipse.debug.core.launchConfigurationTypes">
<launchConfigurationType
delegate="org.apache.magma.tools.magmaeclipse.launch.MagmaLaunchDelegate"
@@ -461,6 +453,14 @@
id="org.apache.magma.tools.magmaeclipse.launch.MagmaRuntimeClasspathProvider">
</classpathProvider>
</extension>
+ <extension
+ point="org.maven.ide.eclipse.indexes">
+ <index
+ archive="magmasemeru.zip"
+ indexId="magmasemeru"
+ repositoryUrl="http://svn.semeru.it/maven-snaps/";>
+ </index>
+ </extension>
</plugin>
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/Activator.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/Activator.java?rev=822032&r1=822031&r2=822032&view=diff
==============================================================================
---
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/Activator.java
(original)
+++
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/Activator.java
Mon Oct 5 21:38:27 2009
@@ -1,7 +1,6 @@
package org.apache.magma.tools.magmaeclipse;
import org.apache.magma.tools.magmaeclipse.basics.MagmaCompilationParticipant;
-import org.apache.magma.tools.magmaeclipse.basics.MagmaMavenListener;
import
org.apache.magma.tools.magmaeclipse.launch.NewLaunchConfigurationListener;
import org.eclipse.ajdt.core.builder.AJBuilder;
import org.eclipse.debug.core.DebugPlugin;
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/MagmaBuilder.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/MagmaBuilder.java?rev=822032&r1=822031&r2=822032&view=diff
==============================================================================
---
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/MagmaBuilder.java
(original)
+++
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/MagmaBuilder.java
Mon Oct 5 21:38:27 2009
@@ -2,6 +2,7 @@
import java.util.Map;
+import org.apache.magma.tools.magmaeclipse.basics.MagmaPDEUtils;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -9,6 +10,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.maven.ide.eclipse.MavenPlugin;
+import org.maven.ide.eclipse.project.IMavenProjectFacade;
/**
* This builder is only responsible of cleaning the extra output folder,
@@ -23,6 +26,11 @@
@Override
protected IProject[] build(int kind, Map args, IProgressMonitor
monitor) throws CoreException {
+ IProject myp = getProject();
+ if (myp.hasNature(MagmaPDEUtils.ID_MAVEN_NATURE)) {
+ IMavenProjectFacade projectFacade =
MavenPlugin.getDefault().getMavenProjectManager().create(myp, monitor);
+ MagmaPDEUtils.setupSourceDependencies(projectFacade,
kind == FULL_BUILD, monitor);
+ }
return null;
}
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java?rev=822032&r1=822031&r2=822032&view=diff
==============================================================================
---
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
(original)
+++
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Mon Oct 5 21:38:27 2009
@@ -280,10 +280,6 @@
MLog.log("Called internal_setupProject on " + project.getName()
+ " complete :" + complete);
setupProjectStructure(project, complete, mon);
try {
- if (project.hasNature(ID_MAVEN_NATURE)) {
- IMavenProjectFacade projectFacade =
MavenPlugin.getDefault().getMavenProjectManager().create(project, mon);
- setupSourceDependencies(projectFacade,
complete, mon);
- }
doneProjectSetup(project);
} catch (Exception e) {
MLog.exception(e, "Error setting up project");
@@ -356,31 +352,6 @@
setup.schedule(1000);
}
- public static void setupSourceDependenciesJob(final IMavenProjectFacade
project, final boolean complete) {
- MLog.log("Called setupSourceDependenciesJob on " +
project.getProject().getName() + " complete :" + complete);
- Job setup = new Job("Setting up Magma source folders") {
- private MagmaProject myprg = new
MagmaProject(project.getProject(), "setupSourceDependencies");
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- setupSourceDependencies(project, complete,
monitor);
- return Status.OK_STATUS;
- }
-
- @Override
- public boolean shouldSchedule() {
- return manager.find(myprg).length == 0;
- }
-
- @Override
- public boolean belongsTo(Object family) {
- return myprg.equals(family);
- }
- };
- setup.schedule(1000);
- }
-
-
/**
* Check inside the project properties to see if it was previously
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
