Skip to content
Snippets Groups Projects
Commit 8226ac80 authored by vkovtun's avatar vkovtun
Browse files

Fixed several issues with build.gradle configurations in various modules, so...

Fixed several issues with build.gradle configurations in various modules, so that the project can be configured in any development environment (like IntelliJ IDEA).
parent 372d0c8c
No related branches found
No related tags found
No related merge requests found
......@@ -51,3 +51,11 @@ test {
testJar {
from "source/java/genericCommonContext.xml"
}
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
}
\ No newline at end of file
......@@ -53,6 +53,11 @@ configurations {
sourceSets.test.runtimeClasspath = configurations.testRuntimeFirst + configurations.testRuntimeSecond + sourceSets.test.runtimeClasspath
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java']
......
......@@ -63,6 +63,11 @@ configurations {
}
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java']
......@@ -123,10 +128,13 @@ task executeOpenBisDev(type: JavaExec) {
jvmArgs(['-Dpython.path=../libraries/jython/jython-lib', '-Dlog4j.configuration=etc/log.xml',
'-Djavax.net.ssl.trustStore=dist/server/openBIS.keystore',
'-Dorg.mortbay.util.FileResource.checkAliases=false', '-Xmx2048M', '-XX:MaxPermSize=512m', '-ea'])
args(['--classes', '../commonbase/targets/classes', '--classes', '../common/targets/classes',
'--classes', '../authentication/targets/classes', '--classes', '../dbmigration/targets/classes',
'--classes', '../openbis-common/targets/classes', '--classes', '../openbis_api/targets/classes',
'--classes', 'targets/classes', '--lib', 'targets/www/lib/', '--port', '8888', 'targets/www'])
args(['--classes', '../commonbase/targets/gradle/classes/main',
'--classes', '../common/targets/gradle/classes/main',
'--classes', '../authentication/targets/gradle/classes/main',
'--classes', '../dbmigration/targets/gradle/classes/main',
'--classes', '../openbis-common/targets/gradle/classes/main',
'--classes', '../openbis_api/targets/gradle/classes/main',
'--classes', 'targets/gradle/classes/main', '--lib', 'targets/www/lib/', '--port', '8888', 'targets/www'])
}
testProjectSamplesEnabled.dependsOn(copyTestData)
......
......@@ -115,7 +115,12 @@ dependencies {
}
sourceSets {
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java', 'sourceTest/java']
......
......@@ -18,7 +18,12 @@ dependencies {
testCompile project(path: ':datastore_server', configuration: 'tests')
}
sourceSets {
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java']
......
......@@ -17,7 +17,12 @@ dependencies {
}
sourceSets {
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java']
......
......@@ -20,7 +20,12 @@ dependencies {
testCompile project(path: ':datastore_server', configuration: 'tests')
}
sourceSets {
sourceSets {
main {
resources {
srcDirs = ['source/java']
}
}
test {
resources {
srcDirs = ['source/java']
......
......@@ -15,6 +15,9 @@ sourceSets {
java {
srcDirs = ['sourceTest/java']
}
resources {
srcDirs = ['source/java']
}
}
test {
java {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment