svn commit: r1709570 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide: launching/RutaLaunchConfigurationDelegate.java validator/RutaEngineAndCallChecker.java

[pk...@apache.org]

Author: pkluegl
Date: Tue Oct 20 11:23:33 2015
New Revision: 1709570

URL: http://svn.apache.org/viewvc?rev=1709570&view=rev
Log:
UIMA-4602
- special treatment of maven/java projects for resolving the classpath of the vm

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java?rev=1709570&r1=1709569&r2=1709570&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLaunchConfigurationDelegate.java Tue Oct 20 11:23:33 2015
@@ -172,14 +172,24 @@ public class RutaLaunchConfigurationDele
 
     IProjectNature m2eNature = project.getProject().getNature(RutaProjectUtils.M2E_NATURE);
     IProjectNature javaNature = project.getProject().getNature(RutaProjectUtils.JAVA_NATURE);
-    
+
     // deactivated until launcher issue is solved
-    if (false && m2eNature != null && javaNature != null) {
+    if (m2eNature != null && javaNature != null) {
       // maven dependencies only
-      
-      // TODO what about the launcher!!??
       Collection<String> classPath = RutaProjectUtils.getClassPath(project.getProject());
       extendedClasspath.addAll(classPath);
+      // IDE UI for launching
+      try {
+        if (!Platform.inDevelopmentMode()) {
+          // Add this plugin jar to the classpath
+          extendedClasspath.add(d.pluginIdToJarPath(RutaIdeUIPlugin.PLUGIN_ID));
+        } else {
+          extendedClasspath.add(d.pluginIdToJarPath(RutaIdeUIPlugin.PLUGIN_ID) + "target/classes");
+        }
+      } catch (IOException e) {
+        throw new CoreException(new Status(IStatus.ERROR, RutaIdeUIPlugin.PLUGIN_ID, IStatus.OK,
+                "Failed to compose classpath!", e));
+      }
     } else {
       // old fashioned mode: use the bundles and check development mode
       try {

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java?rev=1709570&r1=1709569&r2=1709570&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaEngineAndCallChecker.java Tue Oct 20 11:23:33 2015
@@ -29,8 +29,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.uima.ruta.ide.RutaIdeUIPlugin;
-import org.apache.uima.ruta.ide.core.RutaCorePreferences;
-import org.apache.uima.ruta.ide.launching.RutaLaunchConfigurationDelegate;
+import org.apache.uima.ruta.ide.core.builder.RutaProjectUtils;
 import org.apache.uima.ruta.ide.parser.ast.RutaAction;
 import org.apache.uima.ruta.ide.parser.ast.RutaActionConstants;
 import org.apache.uima.ruta.ide.parser.ast.RutaImportStatement;
@@ -38,7 +37,6 @@ import org.apache.uima.ruta.ide.parser.a
 import org.apache.uima.util.InvalidXMLException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.dltk.ast.ASTVisitor;
 import org.eclipse.dltk.ast.declarations.MethodDeclaration;
 import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
@@ -56,7 +54,6 @@ import org.eclipse.dltk.core.builder.IBu
 import org.eclipse.dltk.core.builder.IBuildParticipant;
 import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
 import org.eclipse.dltk.core.builder.ISourceLineTracker;
-import org.eclipse.jface.preference.IPreferenceStore;
 
 public class RutaEngineAndCallChecker implements IBuildParticipant, IBuildParticipantExtension {
 
@@ -97,7 +94,7 @@ public class RutaEngineAndCallChecker im
       // boolean noVM = preferenceStore.getBoolean(RutaCorePreferences.NO_VM_IN_DEV_MODE);
       // if (!(noVM && Platform.inDevelopmentMode())) {
         try {
-          Collection<String> dependencies = RutaLaunchConfigurationDelegate.getClassPath(project);
+          Collection<String> dependencies = RutaProjectUtils.getClassPath(project.getProject());
           URL[] urls = new URL[dependencies.size()];
           int counter = 0;
           for (String dep : dependencies) {