first cleanup phase, move to single src

This commit is contained in:
Shay Banon 2011-12-06 00:58:16 +02:00
parent 473b0f4dff
commit a8fd2d48b8
2587 changed files with 1 additions and 12 deletions

View File

@ -2,11 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules//benchmark-micro.iml" filepath="$PROJECT_DIR$/.idea/modules//benchmark-micro.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/elasticsearch.iml" filepath="$PROJECT_DIR$/.idea/modules/elasticsearch.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" filepath="$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" filepath="$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules//test-integration.iml" filepath="$PROJECT_DIR$/.idea/modules//test-integration.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules//test-testng.iml" filepath="$PROJECT_DIR$/.idea/modules//test-testng.iml" />
</modules> </modules>
</component> </component>
</project> </project>

View File

@ -5,8 +5,6 @@
<output-test url="file://$MODULE_DIR$/../../modules/benchmark/micro/build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../modules/benchmark/micro/build/classes/test" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../../modules/benchmark/micro"> <content url="file://$MODULE_DIR$/../../modules/benchmark/micro">
<sourceFolder url="file://$MODULE_DIR$/../../modules/benchmark/micro/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../modules/benchmark/micro/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/../../modules/benchmark/micro/build" /> <excludeFolder url="file://$MODULE_DIR$/../../modules/benchmark/micro/build" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />

View File

@ -15,8 +15,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="elasticsearch" />
<orderEntry type="module" module-name="test-integration" />
</component> </component>
</module> </module>

View File

@ -5,8 +5,6 @@
<output-test url="file://$MODULE_DIR$/../../modules/elasticsearch/build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../modules/elasticsearch/build/classes/test" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../../modules/elasticsearch"> <content url="file://$MODULE_DIR$/../../modules/elasticsearch">
<sourceFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/build" /> <excludeFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/build" />
<excludeFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/work" /> <excludeFolder url="file://$MODULE_DIR$/../../modules/elasticsearch/work" />
</content> </content>

View File

@ -5,7 +5,6 @@
<output-test url="file://$MODULE_DIR$/../../modules/test/integration/build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../modules/test/integration/build/classes/test" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../../modules/test/integration"> <content url="file://$MODULE_DIR$/../../modules/test/integration">
<sourceFolder url="file://$MODULE_DIR$/../../modules/test/integration/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../modules/test/integration/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../modules/test/integration/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/../../modules/test/integration/build" /> <excludeFolder url="file://$MODULE_DIR$/../../modules/test/integration/build" />
<excludeFolder url="file://$MODULE_DIR$/../../modules/test/integration/work" /> <excludeFolder url="file://$MODULE_DIR$/../../modules/test/integration/work" />

Some files were not shown because too many files have changed in this diff Show More