machaval · Dec 26, 2017 · Jan 3, 2018 · Jan 3, 2018 · Jan 19, 2018 · May 21, 2018
diff --git a/data-weave-plugin/build.gradle b/data-weave-plugin/build.gradle
@@ -28,6 +28,7 @@ dependencies {
 }
 
 intellij {
+    version = ideaVersion
     pluginName = 'data-weave-plugin'
     publish {
         pluginId '8458'

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 #ideaVersion = 2016.3.5
 #ideaVersion = 171.3780.95
-ideaVersion = 2017.3.1
+ideaVersion = IC-2017.3.1
 javaVersion = 1.8
 ijPluginRepoChannel = alpha
 version = 0.14
diff --git a/mule-esb-plugin/build.gradle b/mule-esb-plugin/build.gradle
@@ -39,7 +39,7 @@ sourceSets {
 }
 
 intellij {
-    version ideaVersion
+    version = ideaVersion
     //plugins = ["maven", "groovy", 'properties', 'org.mule.tooling.intellij.dataweave', 'org.mule.tooling.intellij.raml']
     plugins = ["maven", "Groovy", 'properties', project(':data-weave-plugin'), project(':raml-plugin')]
     pluginName = 'mule-esb-plugin'

diff --git a/mule-esb-plugin/src/main/java/org/mule/tooling/esb/actions/APIKitScaffoldingAction.java b/mule-esb-plugin/src/main/java/org/mule/tooling/esb/actions/APIKitScaffoldingAction.java
@@ -7,22 +7,25 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.search.FilenameIndex;
+import com.intellij.psi.search.GlobalSearchScope;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.mule.tooling.esb.launcher.configuration.archive.MuleAppManager;
 import org.mule.tooling.esb.util.MuleConfigUtils;
 import org.mule.tooling.lang.raml.file.RamlFileType;
 import org.mule.tooling.lang.raml.util.RamlIcons;
 import org.mule.tools.apikit.Scaffolder;
 import org.mule.tools.apikit.ScaffolderAPI;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 public class APIKitScaffoldingAction extends AnAction
 {
@@ -51,8 +54,19 @@ public void actionPerformed(AnActionEvent anActionEvent)
         final List<File> ramlFiles = new ArrayList<File>();
         final File ramlFile = new File(file.getPath());
         ramlFiles.add(ramlFile);
+
+//TODO - list all RAML files in the project and add them too?
+//        Collection<VirtualFile> ramlFilesInProject = FilenameIndex.getAllFilesByExt(project, "raml", GlobalSearchScope.projectScope(project));
+//        for (VirtualFile vFile : ramlFilesInProject) {
+//            ramlFiles.add(new File(vFile.getPath()));
+//        }
+
+        //TODO - go through the list of modules and see if any one of them is a Mule domain
+//                if (MuleConfigUtils.isMuleDomainModule(module))
+
         try
         {
+            //TODO Mule version should be derived from Maven project?
             new IdeaScaffolderAPI().execute(ramlFiles, appDir, null, "3.8");
         } catch (RuntimeException e) {
             logger.error("FINALLY CAUGHT RAML ERROR! ", e);

diff --git a/mule-esb-plugin/src/main/java/org/mule/tooling/esb/config/completion/MuleSchemaProvider.java b/mule-esb-plugin/src/main/java/org/mule/tooling/esb/config/completion/MuleSchemaProvider.java
@@ -1,12 +1,20 @@
 package org.mule.tooling.esb.config.completion;
 
+import com.intellij.javaee.ExternalResourceManager;
+import com.intellij.javaee.ResourceRegistrar;
+import com.intellij.javaee.StandardResourceProvider;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.Notifications;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectLocator;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.libraries.Library;
@@ -66,8 +74,10 @@ public XmlFile getSchema(@NotNull @NonNls String url, @Nullable final Module mod
         }
         try {
             Map<String, XmlFile> schemas = getSchemas(module);
-            if (schemas != null)
-                return schemas.get(url);
+            if (schemas != null) {
+                XmlFile schemaFile = schemas.get(url);
+                return schemaFile;
+            }
         } catch (Exception e) {
             //e.printStackTrace();
         }
@@ -127,8 +137,21 @@ public Set<String> getLocations(@NotNull @NonNls final String namespace, @NotNul
             for (Map.Entry<String, XmlFile> entry : schemas.entrySet()) {
                 final String s = getNamespace(entry.getValue(), context.getProject());
                 if (s != null && s.equals(namespace)) {
-                    if (!entry.getKey().contains("mule-httpn.xsd"))
+                    if (!entry.getKey().contains("mule-httpn.xsd")) {
                         locations.add(entry.getKey()); //Observe the formatting rules
+                        XmlFile schemaFile = entry.getValue();
+                        try {
+                            String url = schemaFile.getVirtualFile().getUrl();
+                            if (url != null) {
+                                if (url.startsWith("jar://"))
+                                    url = url.substring(6);
+                                ExternalResourceManager.getInstance().addResource(namespace, url);
+                            }
+                        } catch (Throwable ex) {
+                            Notifications.Bus.notify(new Notification("Schema Provider", "Schema Provider", ex.toString(),
+                                    NotificationType.ERROR));
+                        }
+                    }
                 }
             }
         } catch (Exception e) {
@@ -157,6 +180,7 @@ public Result<Map<String, XmlFile>> compute() {
     }
 
     //============================================================================================================
+
     @NotNull
     private CachedValueProvider.Result<Map<String, XmlFile>> computeSchemas(@NotNull Module module) throws Exception {
         final Project project = module.getProject();

diff --git a/...rc/main/java/org/mule/tooling/esb/launcher/configuration/archive/MuleAppMavenHandler.java b/...rc/main/java/org/mule/tooling/esb/launcher/configuration/archive/MuleAppMavenHandler.java
@@ -38,7 +38,7 @@ public File getMuleApp(final Module module) throws ExecutionException
 
             File applicationZip = null;
             final File[] zips = outputDir.listFiles((dir, name) -> name.endsWith("zip"));
-            if (zips.length > 0)
+            if (zips != null && zips.length > 0)
             {
                 applicationZip = zips[0];
             }

diff --git a/mule-esb-plugin/src/main/java/org/mule/tooling/esb/wizard/MuleDomainMavenModuleBuilder.java b/mule-esb-plugin/src/main/java/org/mule/tooling/esb/wizard/MuleDomainMavenModuleBuilder.java
@@ -91,7 +91,7 @@ public void setMuleVersion(String muleVersion) {
 
     public void setMuleFacet(Module module) {
         FacetType type = FacetTypeRegistry.getInstance().findFacetType(MuleFacet.ID);
-        Facet facet = type.createFacet(module, "Mule", type.createDefaultConfiguration(), null);
+        Facet facet = type.createFacet(module, type.getPresentableName(), type.createDefaultConfiguration(), null);
         ModifiableFacetModel model = FacetManager.getInstance(module).createModifiableModel();
         model.addFacet(facet);
         model.commit();

diff --git a/mule-esb-plugin/src/main/resources/fileTemplates/internal/RAML File.raml.ft b/mule-esb-plugin/src/main/resources/fileTemplates/internal/RAML File.raml.ft
@@ -1,4 +1,4 @@
-#%RAML 0.8
+#%RAML 1.0
 title: MyAPI
 version: 1.0
 baseUri: http://com.foo.bar/api

diff --git a/raml-plugin/build.gradle b/raml-plugin/build.gradle
@@ -1,6 +1,14 @@
+sourceSets {
+	main {
+		java {
+			srcDir 'src/main/java'
+		}
+	}
+}
 
 configurations {
-	compile.exclude module: 'xml-apis'
+	gen
+//	compile.exclude module: 'xml-apis'
 	all*.exclude group: 'xml-apis', module: 'xml-apis'
 	all*.exclude module: 'commons-logging'
 	all*.exclude group: 'org.slf4j'
@@ -11,6 +19,7 @@ dependencies {
 }
 
 intellij {
+	version = ideaVersion
 	plugins = ["yaml"]
 	pluginName = 'raml-plugin'  
 	publish {

diff --git a/raml-plugin/docs/Readme.md b/raml-plugin/docs/Readme.md
@@ -7,10 +7,6 @@
 
 [Installation](#installation)
 
-[Creating DataWeave files](#creating-dataweave-files)
-
-[Run/Debug configurations](#rundebug-configurations)
-
 ## Features
 - Supports RAML 0.8 and RAML 1.0
 - Syntax highlighting and auto completion

diff --git a/raml-plugin/src/main/resources/META-INF/plugin.xml b/raml-plugin/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>org.mule.tooling.intellij.raml</id>
     <name>RAML Plugin For IntelliJ</name>
-    <version>0.13</version>
+    <version>0.14</version>
     <vendor email="achaval@gmail.com" url="https://github.com/machaval/mule-esb-plugin">Mariano Achaval</vendor>
     <description><![CDATA[
      RAML Plugin For IntelliJ

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
-include 'data-weave-plugin'
 include 'raml-plugin'
+include 'data-weave-plugin'
 include 'mule-esb-plugin'