MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

test from jps modules extracted to separate modules to get rid of cyclic dependencies involving JPS modules

Browse Source
This commit is contained in:
nik
2014-02-27 18:07:54 +04:00
parent c367db22bf
commit 140bfa4640
14 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+2
View File
@@ -98,6 +98,8 @@
<module fileurl="file://$PROJECT_DIR$/jps/model-api/jps-model-api.iml" filepath="$PROJECT_DIR$/jps/model-api/jps-model-api.iml" group="jps" />
<module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" group="jps" />
<module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" group="jps" />
<module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml"/>
<module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" group="jps"/>
<module fileurl="file://$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" filepath="$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" group="jps" />
<module fileurl="file://$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" filepath="$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" group="java" />
<module fileurl="file://$PROJECT_DIR$/java/jsp-openapi/jsp-openapi.iml" filepath="$PROJECT_DIR$/java/jsp-openapi/jsp-openapi.iml" group="java" />
build/scripts/layouts.gant
+2 -2
View File
@@ -749,8 +749,8 @@ def layoutCommunityJps(String home, String target) {
dir("test") {
jar("jps-build-test.jar") {
moduleTests("jps-builders")
moduleTests("jps-model-impl")
moduleTests("jps-model-serialization")
moduleTests("jps-model-tests")
moduleTests("jps-serialization-tests")
}
}
jar("ant-jps-plugin.jar") { module("ant-jps-plugin") }
community-main.iml
+3
View File
@@ -93,6 +93,9 @@
<orderEntry type="module" module-name="manifest" />
<orderEntry type="module" module-name="xml-tests" scope="TEST" />
<orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
<orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="java-tests" scope="TEST" />
<orderEntry type="module" module-name="community-tests" scope="TEST" />
jps/jps-builders/jps-builders.iml
+1
View File
@@ -36,6 +36,7 @@
<orderEntry type="module" module-name="jps-model-serialization" />
<orderEntry type="module" module-name="jps-model-impl" />
<orderEntry type="library" scope="TEST" name="Groovy" level="project" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>
jps/model-impl/jps-model-impl.iml
-2
View File
@@ -4,13 +4,11 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="jps-model-api" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />
</component>
</module>
jps/model-impl/jps-model-tests.iml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/testSrc">
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jps-model-impl" />
<orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
</component>
</module>
jps/model-serialization/jps-model-serialization.iml
-3
View File
@@ -4,15 +4,12 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="jps-model-api" />
<orderEntry type="library" exported="" name="JDOM" level="project" />
<orderEntry type="module" module-name="jps-model-impl" exported="" scope="TEST" />
<orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
</component>
</module>
jps/model-serialization/jps-serialization-tests.iml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/testSrc">
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jps-model-serialization" />
<orderEntry type="module" module-name="jps-model-tests" exported="" scope="TEST" />
</component>
</module>
platform/platform-tests/platform-tests.iml
+1
View File
@@ -23,6 +23,7 @@
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="library" name="Netty" level="project" />
<orderEntry type="library" name="http-client" level="project" />
<orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
</component>
</module>
plugins/ant/jps-plugin/ant-jps-plugin.iml
+1
View File
@@ -13,6 +13,7 @@
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="jps-builders" />
<orderEntry type="module" module-name="java-runtime" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>
plugins/devkit/jps-plugin/devkit-jps-plugin.iml
+1
View File
@@ -12,6 +12,7 @@
<orderEntry type="module" module-name="jps-model-serialization" />
<orderEntry type="module" module-name="jps-builders" />
<orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>
plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
+1
View File
@@ -13,6 +13,7 @@
<orderEntry type="module" module-name="jps-model-serialization" />
<orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
<orderEntry type="module" module-name="appEngine-runtime" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>
plugins/maven/jps-plugin/maven-jps-plugin.iml
+1
View File
@@ -22,6 +22,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>
plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
+1
View File
@@ -16,6 +16,7 @@
<orderEntry type="module" module-name="instrumentation-util" />
<orderEntry type="module" module-name="forms-compiler" />
<orderEntry type="module" module-name="forms_rt" />
<orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
</component>
</module>