You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by ca...@apache.org on 2016/07/25 02:13:28 UTC
[2/4] incubator-quarks git commit: work
work
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/600b9c0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/600b9c0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/600b9c0f
Branch: refs/heads/master
Commit: 600b9c0f430e5763a1d9cbdafa4704ec63f454ff
Parents: 0d8b010
Author: cazen.lee <ca...@samsung.com>
Authored: Fri Jul 22 15:26:13 2016 +0900
Committer: cazen.lee <ca...@samsung.com>
Committed: Fri Jul 22 15:26:13 2016 +0900
----------------------------------------------------------------------
api/topology/build.gradle | 10 ++++++++++
build.gradle | 19 +++++--------------
providers/direct/build.gradle | 2 ++
3 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/600b9c0f/api/topology/build.gradle
----------------------------------------------------------------------
diff --git a/api/topology/build.gradle b/api/topology/build.gradle
index 179d96c..d67887a 100644
--- a/api/topology/build.gradle
+++ b/api/topology/build.gradle
@@ -17,3 +17,13 @@ dependencies {
compile project(':api:oplet')
compile ext_classpath
}
+
+
+jar {
+ configure jarOptions
+ jar.includeEmptyDirs = false
+ destinationDir = sourceSets.test.output.classesDir
+ archiveName = "edgent.api.topology.APPS.TEST.jar"
+ //from sourceSets.main.output.classesDir
+ //include 'quarks.test.topology.services.TestApplications$AppOne'
+}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/600b9c0f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c5eb28e..6603899 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,14 +89,6 @@ subprojects {
configure compileOptions
}
- test {
- include '**/*Test.class'
- systemProperty 'edgent.test.top.dir.file.path', rootProject.projectDir
- testLogging {
- exceptionFormat 'full'
- }
- }
-
ext.jarOptions = {
manifest {
attributes(
@@ -144,12 +136,11 @@ subprojects {
build.dependsOn copyJar
}
-task consoleWar (dependsOn: "console:servlets"){
- copy {
- includeEmptyDirs = false
- from "${project("console:servlets").buildDir}"
- into "${rootProject.ext.target_java8_dir}/console/"
- include "**/*.war"
+test {
+ include '**/*Test.class'
+ systemProperty 'edgent.test.top.dir.file.path', rootProject.projectDir
+ testLogging {
+ exceptionFormat 'full'
}
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/600b9c0f/providers/direct/build.gradle
----------------------------------------------------------------------
diff --git a/providers/direct/build.gradle b/providers/direct/build.gradle
index 84566d1..0d784f6 100644
--- a/providers/direct/build.gradle
+++ b/providers/direct/build.gradle
@@ -21,6 +21,8 @@ dependencies {
compile ext_classpath
testCompile project(':utils:metrics')
testCompile project(':runtime:appservice')
+ testCompile files('edgent.api.topology.APPS.TEST.jar')
}
addCompileTestDependencies ':api:topology', ':utils:metrics', ':runtime:appservice'
+