diff --git a/.idea/modules.xml b/.idea/modules.xml index 69d964ff14a5..af8da2526061 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -74,8 +74,6 @@ - - diff --git a/jps/jps.iml b/jps/jps.iml deleted file mode 100644 index 54910c7b6733..000000000000 --- a/jps/jps.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/jps/plugins/appLauncher/jps-appLauncher.iml b/jps/plugins/appLauncher/jps-appLauncher.iml deleted file mode 100644 index d9956ab5a6d8..000000000000 --- a/jps/plugins/appLauncher/jps-appLauncher.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/compiler.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/compiler.xml deleted file mode 100644 index 97c9ca5c8b0a..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/compiler.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/misc.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/misc.xml deleted file mode 100644 index 482d866a4028..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/misc.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/modules.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/modules.xml deleted file mode 100644 index 758808d8019b..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClass.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClass.xml deleted file mode 100644 index 9d98446bbf0b..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClass.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassComplexArgs.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassComplexArgs.xml deleted file mode 100644 index 07bae55f2566..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassComplexArgs.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassEnvVars.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassEnvVars.xml deleted file mode 100644 index 50b5f6ede5f7..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassEnvVars.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassProperties.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassProperties.xml deleted file mode 100644 index 4bd61c1e4cf5..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassProperties.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassVmArgs.xml b/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassVmArgs.xml deleted file mode 100644 index 0d093fdbe0e4..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/.idea/runConfigurations/MainClassVmArgs.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/main-class-run-conf.iml b/jps/plugins/appLauncher/testData/main-class-run-conf/main-class-run-conf.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/main-class-run-conf.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClass.java b/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClass.java deleted file mode 100644 index b4f0cb1d6d33..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClass.java +++ /dev/null @@ -1,8 +0,0 @@ - -public class MainClass { - public static void main(String[] args) { - for (String arg: args) { - System.out.println(arg); - } - } -} diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassEnvVars.java b/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassEnvVars.java deleted file mode 100644 index 2e48ab455e4e..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassEnvVars.java +++ /dev/null @@ -1,8 +0,0 @@ -import java.lang.System; - -public class MainClassEnvVars { - public static void main(String[] args) { - System.out.println(System.getenv("ENV1")); - System.out.println(System.getenv("ENV2")); - } -} diff --git a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassProperties.java b/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassProperties.java deleted file mode 100644 index 5f19e3ca4829..000000000000 --- a/jps/plugins/appLauncher/testData/main-class-run-conf/src/MainClassProperties.java +++ /dev/null @@ -1,9 +0,0 @@ -import java.lang.System; - -public class MainClassProperties { - public static void main(String[] args) { - System.out.println(System.getProperty("my.prop1")); - System.out.println(System.getProperty("my.prop2")); - System.out.println(System.getProperty("my.prop3")); - } -} diff --git a/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/broken.xml b/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/broken.xml deleted file mode 100644 index 0586f2a6fe62..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/broken.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/broken - - - - - - - pre-step - - - - - - - - - \ No newline at end of file diff --git a/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/main.xml b/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/main.xml deleted file mode 100644 index 88f8e33d71e6..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/.idea/artifacts/main.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/main - - - file://$PROJECT_DIR$/scripts/build.xml - post-step - - - - - - - file://$PROJECT_DIR$/scripts/build.xml - pre-step - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/testData/artifactWithAntPrePostTasks/.idea/compiler.xml b/jps/testData/artifactWithAntPrePostTasks/.idea/compiler.xml deleted file mode 100644 index 97c9ca5c8b0a..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/.idea/compiler.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/jps/testData/artifactWithAntPrePostTasks/.idea/misc.xml b/jps/testData/artifactWithAntPrePostTasks/.idea/misc.xml deleted file mode 100644 index d9d0db5f3824..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/jps/testData/artifactWithAntPrePostTasks/.idea/modules.xml b/jps/testData/artifactWithAntPrePostTasks/.idea/modules.xml deleted file mode 100644 index 8f66263cea7a..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/jps/testData/artifactWithAntPrePostTasks/artifactWithAntPrePostTasks.iml b/jps/testData/artifactWithAntPrePostTasks/artifactWithAntPrePostTasks.iml deleted file mode 100644 index ef582b1af949..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/artifactWithAntPrePostTasks.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/jps/testData/artifactWithAntPrePostTasks/file.txt b/jps/testData/artifactWithAntPrePostTasks/file.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/jps/testData/artifactWithAntPrePostTasks/scripts/build.xml b/jps/testData/artifactWithAntPrePostTasks/scripts/build.xml deleted file mode 100644 index 8f3c9b075460..000000000000 --- a/jps/testData/artifactWithAntPrePostTasks/scripts/build.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/testSrc/org/jetbrains/jps/AntPrePostStepsInArtifactsTest.groovy b/jps/testSrc/org/jetbrains/jps/AntPrePostStepsInArtifactsTest.groovy deleted file mode 100644 index f7a99c2c0f69..000000000000 --- a/jps/testSrc/org/jetbrains/jps/AntPrePostStepsInArtifactsTest.groovy +++ /dev/null @@ -1,33 +0,0 @@ -package org.jetbrains.jps -import junit.framework.TestCase - -class AntPrePostStepsInArtifactsTest extends TestCase { - //todo[nik] move to ant plugin and fix - public void test() throws Exception { - //Project project = loadProject("testData/artifactWithAntPrePostTasks/.idea", [:]) - //builder.tempFolder = FileUtil.createTempDirectory("ant-jps-artifacts", "").absolutePath - //builder.clean() - //builder.buildArtifact("main") - //builder.deleteTempFiles() - //File outDir = new File("testData/artifactWithAntPrePostTasks/out"); - //assertOutput(outDir.getAbsolutePath(), { - // dir("artifacts") { - // dir("main") { - // dir("dir") { - // file("file.txt") - // } - // file("prestep.txt", "pre1") - // file("poststep.txt", "${com.intellij.openapi.util.io.FileUtil.toSystemIndependentName(outDir.absolutePath)}/artifacts/main") - // } - // } - //}) - } - - public void test_broken_artifact() throws Exception { - //Project project = loadProject("testData/artifactWithAntPrePostTasks/.idea", [:]) - //assertEquals(2, project.artifacts.size()); - //for (Artifact a: project.artifacts.values()) { - // assertNull(project.artifacts.properties); - //} - } -}