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:27 UTC
[1/4] incubator-quarks git commit: Chz logic for finding war if exist
2
Repository: incubator-quarks
Updated Branches:
refs/heads/master b86179228 -> 1153aad6f
Chz logic for finding war if exist 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/0d8b0102
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/0d8b0102
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/0d8b0102
Branch: refs/heads/master
Commit: 0d8b01027b11129bb007af8c8ff5749604ab0f1c
Parents: b861792
Author: Cazen Lee <ca...@apache.org>
Authored: Fri Jul 22 04:14:46 2016 +0000
Committer: Cazen Lee <ca...@apache.org>
Committed: Fri Jul 22 04:14:46 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/edgent/console/server/ServerUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0d8b0102/console/server/src/main/java/org/apache/edgent/console/server/ServerUtil.java
----------------------------------------------------------------------
diff --git a/console/server/src/main/java/org/apache/edgent/console/server/ServerUtil.java b/console/server/src/main/java/org/apache/edgent/console/server/ServerUtil.java
index 02020f0..5002d5d 100644
--- a/console/server/src/main/java/org/apache/edgent/console/server/ServerUtil.java
+++ b/console/server/src/main/java/org/apache/edgent/console/server/ServerUtil.java
@@ -79,7 +79,7 @@ public class ServerUtil {
} catch (IOException e) {
// end of file searching
}
- if (foundFiles.size() == 1) {
+ if (foundFiles.size() != 0) {
return foundFiles.get(0);
}
return null;
[2/4] incubator-quarks git commit: work
Posted by ca...@apache.org.
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'
+
[4/4] incubator-quarks git commit: add war dependency
Posted by ca...@apache.org.
add war dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/1153aad6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/1153aad6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/1153aad6
Branch: refs/heads/master
Commit: 1153aad6f4339eead87aebb470f55c122f195908
Parents: 8a2aecc
Author: Cazen Lee <ca...@apache.org>
Authored: Sun Jul 24 22:57:25 2016 +0900
Committer: Cazen Lee <ca...@apache.org>
Committed: Sun Jul 24 22:57:25 2016 +0900
----------------------------------------------------------------------
console/servlets/build.gradle | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/1153aad6/console/servlets/build.gradle
----------------------------------------------------------------------
diff --git a/console/servlets/build.gradle b/console/servlets/build.gradle
index 724e52d..58c2374 100644
--- a/console/servlets/build.gradle
+++ b/console/servlets/build.gradle
@@ -34,3 +34,5 @@ war {
}
webXml = file('webapp_content/WEB-INF/console.xml')
}
+
+testClasses.dependsOn war
[3/4] incubator-quarks git commit: Add TestApplications Jar
Posted by ca...@apache.org.
Add TestApplications Jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/8a2aecc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/8a2aecc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/8a2aecc2
Branch: refs/heads/master
Commit: 8a2aecc2a4940b3a1cc9806addc8de99c4a098dc
Parents: 600b9c0
Author: Cazen Lee <ca...@apache.org>
Authored: Sun Jul 24 01:21:35 2016 +0900
Committer: Cazen Lee <ca...@apache.org>
Committed: Sun Jul 24 01:26:54 2016 +0900
----------------------------------------------------------------------
api/topology/build.gradle | 20 ++++++++++++--------
build.gradle | 18 ++++++++++--------
providers/direct/build.gradle | 2 --
3 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/8a2aecc2/api/topology/build.gradle
----------------------------------------------------------------------
diff --git a/api/topology/build.gradle b/api/topology/build.gradle
index d67887a..4dc9644 100644
--- a/api/topology/build.gradle
+++ b/api/topology/build.gradle
@@ -18,12 +18,16 @@ dependencies {
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'
+//Build a jar file containing the applications to test the ApplicationService
+task testApplicationJar{
+ ant.jar(destfile: "test.classes/edgent.api.topology.APPS.TEST.jar") {
+ service(type: 'org.apache.edgent.topology.services.TopologyBuilder') {
+ provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppOne')
+ provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppTwo')
+ provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppThree')
+ }
+ fileset (dir: 'test.classes', includes: '**/*TestApplications$App*.class')
+ }
}
+
+testClasses.dependsOn testApplicationJar
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/8a2aecc2/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6603899..7a98394 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,6 +89,16 @@ subprojects {
configure compileOptions
}
+ test {
+ include '**/*Test.class'
+
+ systemProperty 'edgent.test.top.dir.file.path', rootProject.projectDir
+ systemProperty 'edgent.test.root.dir', rootProject.projectDir
+ testLogging {
+ exceptionFormat 'full'
+ }
+ }
+
ext.jarOptions = {
manifest {
attributes(
@@ -136,14 +146,6 @@ subprojects {
build.dependsOn copyJar
}
-test {
- include '**/*Test.class'
- systemProperty 'edgent.test.top.dir.file.path', rootProject.projectDir
- testLogging {
- exceptionFormat 'full'
- }
-}
-
task copyScript {
copy {
includeEmptyDirs = false
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/8a2aecc2/providers/direct/build.gradle
----------------------------------------------------------------------
diff --git a/providers/direct/build.gradle b/providers/direct/build.gradle
index 0d784f6..84566d1 100644
--- a/providers/direct/build.gradle
+++ b/providers/direct/build.gradle
@@ -21,8 +21,6 @@ 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'
-