diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index 015f00eb5652..d838e9bc8e75 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -411,7 +411,6 @@ binding.setVariable("platformImplementationModules", [ "jps-model-impl", "jps-model-serialization", "json", - "jsonSchema", "lang-impl", "lvcs-impl", "platform-impl", diff --git a/json/json.iml b/json/json.iml index 1add5130b35f..213d178ac839 100644 --- a/json/json.iml +++ b/json/json.iml @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaConfigurable.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaConfigurable.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaConfigurable.java rename to json/src/com/jetbrains/jsonSchema/JsonSchemaConfigurable.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurable.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurable.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurable.java rename to json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurable.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurationBase.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurationBase.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurationBase.java rename to json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsConfigurationBase.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java rename to json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsView.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsView.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/JsonSchemaMappingsView.java rename to json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsView.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaFileProvider.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaFileProvider.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaFileProvider.java rename to json/src/com/jetbrains/jsonSchema/extension/JsonSchemaFileProvider.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaImportedProviderFactory.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaImportedProviderFactory.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaImportedProviderFactory.java rename to json/src/com/jetbrains/jsonSchema/extension/JsonSchemaImportedProviderFactory.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java rename to json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaAnnotator.java b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaAnnotator.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaAnnotator.java rename to json/src/com/jetbrains/jsonSchema/ide/JsonSchemaAnnotator.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaCompletionContributor.java b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaCompletionContributor.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaCompletionContributor.java rename to json/src/com/jetbrains/jsonSchema/ide/JsonSchemaCompletionContributor.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaDocumentationProvider.java b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaDocumentationProvider.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaDocumentationProvider.java rename to json/src/com/jetbrains/jsonSchema/ide/JsonSchemaDocumentationProvider.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java b/json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java rename to json/src/com/jetbrains/jsonSchema/ide/JsonSchemaService.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaDocumentationProvider.java b/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaDocumentationProvider.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaDocumentationProvider.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaDocumentationProvider.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java b/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java b/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectCodeInsightWrapper.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectCodeInsightWrapper.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectCodeInsightWrapper.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectCodeInsightWrapper.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaPropertyProcessor.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaPropertyProcessor.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaPropertyProcessor.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaPropertyProcessor.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaReader.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaReader.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaReader.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaReader.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaType.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaType.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaType.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaType.java diff --git a/json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java similarity index 100% rename from json/jsonSchema/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java rename to json/src/com/jetbrains/jsonSchema/impl/JsonSchemaWalker.java diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java similarity index 97% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java rename to json/tests/test/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java index 24af27dd1f6a..e437f05bc97d 100644 --- a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java +++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaDocumentationTest.java @@ -25,7 +25,7 @@ public class JsonSchemaDocumentationTest extends LightPlatformCodeInsightFixture @Override protected String getBasePath() { - return "/json/jsonSchema/testData/documentation"; + return "/json/tests/testData/jsonSchema/documentation"; } public void testSimple() throws Exception { diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java similarity index 99% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java rename to json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java index 29190d6967f7..eff82464666b 100644 --- a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java +++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java @@ -27,7 +27,7 @@ import java.util.List; public class JsonSchemaHighlightingTest extends DaemonAnalyzerTestCase { @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/jsonSchema/testData/highlighting"; + return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonSchema/highlighting"; } public void testNumberMultipleWrong() throws Exception { diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaTestProvider.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaTestProvider.java similarity index 100% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaTestProvider.java rename to json/tests/test/com/jetbrains/jsonSchema/JsonSchemaTestProvider.java diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaTestServiceImpl.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaTestServiceImpl.java similarity index 100% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/JsonSchemaTestServiceImpl.java rename to json/tests/test/com/jetbrains/jsonSchema/JsonSchemaTestServiceImpl.java diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/impl/JsonBySchemaCompletionTest.java b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaCompletionTest.java similarity index 100% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/impl/JsonBySchemaCompletionTest.java rename to json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaCompletionTest.java diff --git a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java similarity index 97% rename from json/jsonSchema/testSrc/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java rename to json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java index 944a2f64738c..ac856727ea82 100644 --- a/json/jsonSchema/testSrc/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java +++ b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java @@ -13,7 +13,7 @@ import java.util.List; public class JsonSchemaReadTest { @org.junit.Test public void testReadSchemaItself() throws Exception { - final File file = new File(PlatformTestUtil.getCommunityPath(), "json/jsonSchema/testData/schema.json"); + final File file = new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/schema.json"); Assert.assertTrue(file.exists()); final JsonSchemaReader reader = new JsonSchemaReader(); final JsonSchemaObject read = reader.read(new FileReader(file)); diff --git a/json/jsonSchema/testData/documentation/secondLevel.html b/json/tests/testData/jsonSchema/documentation/secondLevel.html similarity index 100% rename from json/jsonSchema/testData/documentation/secondLevel.html rename to json/tests/testData/jsonSchema/documentation/secondLevel.html diff --git a/json/jsonSchema/testData/documentation/secondLevel.json b/json/tests/testData/jsonSchema/documentation/secondLevel.json similarity index 100% rename from json/jsonSchema/testData/documentation/secondLevel.json rename to json/tests/testData/jsonSchema/documentation/secondLevel.json diff --git a/json/jsonSchema/testData/documentation/secondLevel_schema.json b/json/tests/testData/jsonSchema/documentation/secondLevel_schema.json similarity index 100% rename from json/jsonSchema/testData/documentation/secondLevel_schema.json rename to json/tests/testData/jsonSchema/documentation/secondLevel_schema.json diff --git a/json/jsonSchema/testData/documentation/simple.html b/json/tests/testData/jsonSchema/documentation/simple.html similarity index 100% rename from json/jsonSchema/testData/documentation/simple.html rename to json/tests/testData/jsonSchema/documentation/simple.html diff --git a/json/jsonSchema/testData/documentation/simple.json b/json/tests/testData/jsonSchema/documentation/simple.json similarity index 100% rename from json/jsonSchema/testData/documentation/simple.json rename to json/tests/testData/jsonSchema/documentation/simple.json diff --git a/json/jsonSchema/testData/documentation/simple_schema.json b/json/tests/testData/jsonSchema/documentation/simple_schema.json similarity index 100% rename from json/jsonSchema/testData/documentation/simple_schema.json rename to json/tests/testData/jsonSchema/documentation/simple_schema.json diff --git a/json/jsonSchema/testData/highlighting/integerTypeWithMinMax.json b/json/tests/testData/jsonSchema/highlighting/integerTypeWithMinMax.json similarity index 100% rename from json/jsonSchema/testData/highlighting/integerTypeWithMinMax.json rename to json/tests/testData/jsonSchema/highlighting/integerTypeWithMinMax.json diff --git a/json/jsonSchema/testData/highlighting/integerTypeWithMinMax_schema.json b/json/tests/testData/jsonSchema/highlighting/integerTypeWithMinMax_schema.json similarity index 100% rename from json/jsonSchema/testData/highlighting/integerTypeWithMinMax_schema.json rename to json/tests/testData/jsonSchema/highlighting/integerTypeWithMinMax_schema.json diff --git a/json/jsonSchema/testData/schema.json b/json/tests/testData/jsonSchema/schema.json similarity index 100% rename from json/jsonSchema/testData/schema.json rename to json/tests/testData/jsonSchema/schema.json