svn commit: r1676036 - in /uima/ruta/trunk: ruta-core/src/main/java/org/apache/uima/ruta/descriptor/ ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/ ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/

[pk...@apache.org]

Author: pkluegl
Date: Sat Apr 25 16:37:07 2015
New Revision: 1676036

URL: http://svn.apache.org/r1676036
Log:
UIMA-4287
- adapted IDE building to recent changes: store the name and package of the script in an additional object

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
    uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
    uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java?rev=1676036&r1=1676035&r2=1676036&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java Sat Apr 25 16:37:07 2015
@@ -307,7 +307,7 @@ public class RutaDescriptorBuilder {
   }
 
   public void build(RutaDescriptorInformation desc, String typeSystemOutput, String engineOutput,
-          RutaBuildOptions options, String mainScript, String[] scriptPaths, String[] enginePaths)
+          RutaBuildOptions options, String[] scriptPaths, String[] enginePaths)
           throws SAXException, InvalidXMLException, IOException, ResourceInitializationException,
           URISyntaxException {
 

Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1676036&r1=1676035&r2=1676036&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Sat Apr 25 16:37:07 2015
@@ -265,6 +265,9 @@ List<Statement> stmts = new ArrayList<St
 	{
 	String packageName = "";
 	if(p != null) {packageName = p.getName();}
+	if(descriptor != null) {
+    descriptor.setPackageString(packageName);
+  }
 	rootBlock = scriptFactory.createScriptBlock(0,0,0,0,module, null, null, packageName);
 	stmts.add(p);
 	this.module = module;

Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java?rev=1676036&r1=1676035&r2=1676036&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java Sat Apr 25 16:37:07 2015
@@ -157,7 +157,6 @@ public class RutaBuilder extends Abstrac
         }
       }
       
-      IPath scriptPath = RutaProjectUtils.getScriptRootPath(project);
       IPath relativePackagePath = RutaProjectUtils.getPackagePath(sourceModule.getResource()
               .getLocation(), project);
       IPath descPackagePath = descPath.append(relativePackagePath);
@@ -204,7 +203,7 @@ public class RutaBuilder extends Abstrac
         counter++;
       }
       ClassLoader classloader = new URLClassLoader(urls);
-      build(basicTS, basicE, typeSystem, engine, sm, mainScript, scriptPaths, descriptorPaths, classloader);
+      build(basicTS, basicE, typeSystem, engine, sm, scriptPaths, descriptorPaths, classloader);
 
       IPath tsPath = Path.fromPortableString(typeSystem);
       IPath ePath = Path.fromPortableString(engine);
@@ -215,7 +214,7 @@ public class RutaBuilder extends Abstrac
   }
 
   private void build(String basicTypesystem, String basicEngine, String typeSystemDest,
-          String engineDest, RutaDescriptorInformation sm, String mainScript, String[] scriptPaths,
+          String engineDest, RutaDescriptorInformation sm, String[] scriptPaths,
           String[] enginePaths, ClassLoader classloader) {
     RutaDescriptorBuilder builder = null;
     try {
@@ -281,7 +280,7 @@ public class RutaBuilder extends Abstrac
       option.setImportByName(store.getBoolean(RutaCorePreferences.BUILDER_IMPORT_BY_NAME));
       option.setResolveImports(store.getBoolean(RutaCorePreferences.BUILDER_RESOLVE_IMPORTS));
       option.setClassLoader(classloader);
-      builder.build(sm, typeSystemDest, engineDest, option, mainScript, scriptPaths, enginePaths);
+      builder.build(sm, typeSystemDest, engineDest, option, scriptPaths, enginePaths);
     } catch (Exception e) {
       DLTKCore.error(e.getMessage(), e);
       if (DLTKCore.DEBUG_PARSER) {