Moving scripting to integrations, since it needs external providers

schemacrawler · Feb 11, 2018 · 4e79129 · 4e79129
1 parent ed21b29
commit 4e79129
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 84 deletions.
diff --git a/...tion/scripting/ScriptCommandProvider.java → ...tion/scripting/ScriptCommandProvider.java b/...tion/scripting/ScriptCommandProvider.java → ...tion/scripting/ScriptCommandProvider.java
diff --git a/...tegration/scripting/ScriptExecutable.java → ...tegration/scripting/ScriptExecutable.java b/...tegration/scripting/ScriptExecutable.java → ...tegration/scripting/ScriptExecutable.java
diff --git a/...tions/src/main/resources/META-INF/services/schemacrawler.tools.executable.CommandProvider b/...tions/src/main/resources/META-INF/services/schemacrawler.tools.executable.CommandProvider
@@ -1,3 +1,4 @@
+schemacrawler.tools.integration.scripting.ScriptCommandProvider
 schemacrawler.tools.integration.freemarker.FreeMarkerCommandProvider
 schemacrawler.tools.integration.velocity.VelocityCommandProvider
 schemacrawler.tools.integration.serialization.SerializationCommandProvider

diff --git a/...est/SchemaCrawlerExecutableChainTest.java → ...est/SchemaCrawlerExecutableChainTest.java b/...est/SchemaCrawlerExecutableChainTest.java → ...est/SchemaCrawlerExecutableChainTest.java
@@ -26,7 +26,7 @@
 ========================================================================
 */
 
-package schemacrawler.test;
+package schemacrawler.integration.test;
 
 
 import static org.junit.Assert.assertEquals;

diff --git a/...crawler-tools/src/test/resources/chain.js → ...-integrations/src/test/resources/chain.js b/...crawler-tools/src/test/resources/chain.js → ...-integrations/src/test/resources/chain.js
diff --git a/...est/resources/executableForJavaScript.txt → ...est/resources/executableForJavaScript.txt b/...est/resources/executableForJavaScript.txt → ...est/resources/executableForJavaScript.txt
diff --git a/schemacrawler-tools/src/main/java/schemacrawler/tools/executable/CommandRegistry.java b/schemacrawler-tools/src/main/java/schemacrawler/tools/executable/CommandRegistry.java
@@ -39,7 +39,6 @@
 import schemacrawler.schemacrawler.SchemaCrawlerException;
 import schemacrawler.schemacrawler.SchemaCrawlerOptions;
 import schemacrawler.tools.integration.graph.GraphExecutableCommandProvider;
-import schemacrawler.tools.integration.scripting.ScriptCommandProvider;
 import schemacrawler.tools.options.OutputOptions;
 import sf.util.SchemaCrawlerLogger;
 import sf.util.StringFormat;
@@ -64,7 +63,6 @@ private static List<CommandProvider> loadCommandRegistry()
     commandProviders.add(new SchemaExecutableCommandProvider());
     commandProviders.add(new OperationExecutableCommandProvider());
     commandProviders.add(new GraphExecutableCommandProvider());
-    commandProviders.add(new ScriptCommandProvider());
 
     try
     {

diff --git a/schemacrawler-tools/src/test/java/schemacrawler/test/ExtendedCommandsTest.java b/schemacrawler-tools/src/test/java/schemacrawler/test/ExtendedCommandsTest.java
diff --git a/schemacrawler-tools/src/test/resources/plaintextschema.js b/schemacrawler-tools/src/test/resources/plaintextschema.js