421015 fixed workspace runtime missing libraries in some cases

Added code to handle custom library classpath entries to workspace
maven runtime.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLauncherConfigurationHandler.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLauncherConfigurationHandler.java
index 8bcb34c2..1b5cc1ec 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLauncherConfigurationHandler.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLauncherConfigurationHandler.java
@@ -12,6 +12,7 @@
 package org.eclipse.m2e.internal.launch;
 
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -21,8 +22,13 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.osgi.util.NLS;
 
 import org.eclipse.m2e.core.embedder.IMavenLauncherConfiguration;
@@ -56,6 +62,27 @@ public class MavenLauncherConfigurationHandler implements IMavenLauncherConfigur
     if(output.isAccessible()) {
       addArchiveEntry(output.getLocation().toFile().getAbsolutePath());
     }
+    // add custom classpath entries
+    final IJavaProject javaProject = JavaCore.create(facade.getProject());
+    try {
+      for(IClasspathEntry cpe : javaProject.getRawClasspath()) {
+        if(cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+          IResource resource = root.findMember(cpe.getPath());
+          if(resource != null) {
+            // workspace resource
+            addArchiveEntry(resource.getLocation().toOSString());
+          } else {
+            // external 
+            File file = cpe.getPath().toFile();
+            if(file.exists()) {
+              addArchiveEntry(file.getAbsolutePath());
+            }
+          }
+        }
+      }
+    } catch(JavaModelException ex) {
+      // XXX to do what to do about this
+    }
   }
 
   public void addRealm(String realm) {