Skip to content

Commit

Permalink
Improved: Separate resources from Java source files
Browse files Browse the repository at this point in the history
(OFBIZ-11161)

This moves the resource files in a dedicated "src/main/resources"
directory.  This convention follows the Maven standard directory
layout which is the convention used by default in Gradle.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865717 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mthl committed Aug 22, 2019
1 parent 4250ca7 commit 4c70084
Show file tree
Hide file tree
Showing 14 changed files with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,9 @@ sourceSets {
srcDirs = getDirectoryInActiveComponentsIfExists('src/main/groovy')
}
resources {
srcDirs = getDirectoryInActiveComponentsIfExists('src/main/java')
srcDirs = getDirectoryInActiveComponentsIfExists('src/main/resources')
srcDirs += getDirectoryInActiveComponentsIfExists('config')
srcDirs += getDirectoryInActiveComponentsIfExists('dtd')
exclude excludedJavaSources
exclude excludedConfigFiles
// Below are necessary for unit tests run by Gradle and integration tests
exclude { FileTreeElement elem -> elem.getName().contains('Labels.xml') }
Expand All @@ -305,7 +304,7 @@ sourceSets {
srcDirs = getDirectoryInActiveComponentsIfExists('src/test/groovy')
}
resources {
srcDirs = getDirectoryInActiveComponentsIfExists('src/test/java')
srcDirs = getDirectoryInActiveComponentsIfExists('src/test/resources')
}
}
}
Expand Down

0 comments on commit 4c70084

Please sign in to comment.