You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2019/08/23 11:21:48 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_5 updated: SOLR-13452:
Refactor IDEA module structure
This is an automated email from the ASF dual-hosted git repository.
tomoko pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_5 by this push:
new 82022fd SOLR-13452: Refactor IDEA module structure
82022fd is described below
commit 82022fdad3db532e0a9acd28c0cd5d6454abd334
Author: Tomoko Uchida <to...@apache.org>
AuthorDate: Fri Aug 23 20:11:54 2019 +0900
SOLR-13452: Refactor IDEA module structure
---
.gitignore | 4 +-
buildSrc/ide/idea.gradle | 20 +-------
dev-tools/idea/.idea/modules.xml | 102 +++++++++++++++++++--------------------
3 files changed, 55 insertions(+), 71 deletions(-)
diff --git a/.gitignore b/.gitignore
index 99b9c8b..28b854a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,9 @@ test-lib
/build.properties
/.idea
lucene/**/*.iml
-parent.iml
+/_lucene-solr.iml
+/dev-tools/dev-tools.iml
+/buildSrc/buildSrc.iml
*.ipr
*.iws
.project
diff --git a/buildSrc/ide/idea.gradle b/buildSrc/ide/idea.gradle
index 04bcdd7..1b2d9ac 100644
--- a/buildSrc/ide/idea.gradle
+++ b/buildSrc/ide/idea.gradle
@@ -27,30 +27,17 @@ idea {
copy {
from file("${rootProjectDir}/dev-tools/idea/.idea")
into file("${rootProjectDir}/.idea")
+ exclude { details -> details.file.name == "libraries"}
}
copy {
from file("${rootProjectDir}/dev-tools/idea/parent.iml")
into file("${rootProjectDir}")
+ rename { it.replace("parent", "_lucene-solr") }
}
copy {
from file("${rootProjectDir}/dev-tools/idea/dev-tools/scripts")
into file("${rootProjectDir}/dev-tools/scripts")
}
- } else {
- copy {
- def tmplPath = projectDir.canonicalPath.replaceFirst(rootProjectDir.canonicalPath, "")
- from file("${rootProjectDir}/dev-tools/idea${tmplPath}")
- into file("${projectDir}")
- }
- }
- }
-
- iml.whenMerged {
- // if .iml exists, fix module name
- def imlFiles = fileTree(dir: ".", include: "*.iml").files.name
- if (!imlFiles.isEmpty()) {
- def imlFile = imlFiles.get(0)
- name = imlFile.substring(0, imlFile.length() - 4)
}
}
}
@@ -62,10 +49,7 @@ task cleanUpCustomConfig() {
doLast {
if (projectDir.name == "buildSrc") {
delete file("${rootProjectDir}/.idea")
- delete file("${rootProjectDir}/parent.iml")
delete file("${rootProjectDir}/dev-tools/scripts/scripts.iml")
- } else {
- delete fileTree(".") { include "**/*.iml" }
}
}
}
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index faa7684..69a09a7 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -4,64 +4,62 @@
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/core/src/lucene-core.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/core/src/test/lucene-core-tests.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/backward-codecs/backward-codecs.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/codecs/src/codecs.iml" />
- <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/codecs/src/test/codecs-tests.iml" />
+ <module group="DevTools" filepath="$PROJECT_DIR$/dev-tools/dev-tools.iml" />
+ <module group="DevTools" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" />
+
+ <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/core/lucene-core.iml" />
+ <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/backward-codecs/lucene-backward-codecs.iml" />
+ <module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/codecs/lucene-codecs.iml" />
<module group="Lucene/Core" filepath="$PROJECT_DIR$/lucene/test-framework/lucene-test-framework.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/common/analysis-common.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/icu/icu.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/nori/nori.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/kuromoji/kuromoji.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/morfologik/morfologik.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/opennlp/opennlp.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/phonetic/phonetic.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
- <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/common/lucene-analyzers-common.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/icu/lucene-analyzers-icu.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/nori/lucene-analyzers-nori.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/kuromoji/lucene-analyzers-kuromoji.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/morfologik/lucene-analyzers-morfologik.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/opennlp/lucene-analyzers-opennlp.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/phonetic/lucene-analyzers-phonetic.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/smartcn/lucene-analyzers-smartcn.iml" />
+ <module group="Lucene/Analysis" filepath="$PROJECT_DIR$/lucene/analysis/stempel/lucene-analyzers-stempel.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/src/benchmark.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/conf/benchmark-conf.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/classification/classification.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/expressions/expressions.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/facet/facet.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/grouping/grouping.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/join/join.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/luke/luke.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/monitor/monitor.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/misc/misc.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queries/queries.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queryparser/queryparser.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/replicator/replicator.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/sandbox/sandbox.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial/spatial.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial-extras/spatial-extras.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial3d/spatial3d.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/suggest/suggest.iml" />
- <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/tools/tools.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/benchmark/lucene-benchmark.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/classification/lucene-classification.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/demo/lucene-demo.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/expressions/lucene-expressions.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/facet/lucene-facet.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/grouping/lucene-grouping.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/highlighter/lucene-highlighter.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/join/lucene-join.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/luke/lucene-luke.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/monitor/lucene-monitor.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/memory/lucene-memory.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/misc/lucene-misc.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queries/lucene-queries.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/queryparser/lucene-queryparser.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/replicator/lucene-replicator.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/sandbox/lucene-sandbox.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial/lucene-spatial.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial-extras/lucene-spatial-extras.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/spatial3d/lucene-spatial3d.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/suggest/lucene-suggest.iml" />
+ <module group="Lucene/Other" filepath="$PROJECT_DIR$/lucene/tools/lucene-tools.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/solr-core-tests.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/server/server.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
- <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/solrj-tests.iml" />
+ <module group="Solr" filepath="$PROJECT_DIR$/solr/core/solr-core.iml" />
+ <module group="Solr" filepath="$PROJECT_DIR$/solr/server/solr-server.iml" />
+ <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/solr-solrj.iml"/>
<module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analytics/analytics.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/ltr.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/prometheus-exporter/prometheus-exporter.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/jaegertracer-configurator/jaegertracer-configurator.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/solr-contrib-analysis-extras.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/analytics/solr-contrib-analytics.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/clustering/solr-contrib-clustering.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/solr-contrib-dataimporthandler-extras.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/solr-contrib-dataimporthandler.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/extraction/solr-contrib-extraction.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/solr-contrib-langid.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/solr-contrib-ltr.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/prometheus-exporter/solr-contrib-prometheus-exporter.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/jaegertracer-configurator/solr-contrib-jaegertracer-configurator.iml" />
+ <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/solr-contrib-velocity.iml" />
</modules>
</component>
</project>