You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/06/21 15:23:01 UTC

[1/4] incubator-quarks git commit: add copyJar function to root gradle script

Repository: incubator-quarks
Updated Branches:
  refs/heads/master aa96292f3 -> 67a4276a2


add copyJar function to root gradle script


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/9d506899
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/9d506899
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/9d506899

Branch: refs/heads/master
Commit: 9d50689985c0dce03fbe6117c284a55c385473f6
Parents: d982184
Author: cazen.lee <ca...@samsung.com>
Authored: Mon Jun 13 15:32:45 2016 +0900
Committer: cazen <ca...@apache.org>
Committed: Mon Jun 13 08:46:22 2016 +0000

----------------------------------------------------------------------
 build.gradle                                   | 35 +++++++++++++++++++--
 connectors/javax.websocket-client/build.gradle |  2 --
 connectors/javax.websocket-server/build.gradle |  2 --
 connectors/quarks.javax.websocket/build.gradle |  2 --
 4 files changed, 32 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9d506899/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0f31dbd..2bbed9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,9 +22,15 @@ ext.commithash = {
 def now = new Date()
 ext.DSTAMP = String.format('%tY%<tm%<td', now)
 ext.TSTAMP = String.format('%tH%<tM', now)
-ext.ext_classpath = ['com.google.code.gson:gson:2.2.4', 
-  'org.slf4j:slf4j-api:1.7.12', 
+ext.ext_classpath = ['com.google.code.gson:gson:2.2.4',
+  'org.slf4j:slf4j-api:1.7.12',
   'io.dropwizard.metrics:metrics-core:3.1.2']
+ext.buildDir = "${rootDir}/target/gradle"
+
+task clean(type: Delete) {
+    println "delete =  ${rootProject.ext.buildDir}"
+    delete "${rootProject.ext.buildDir}"
+}
 
 /* Configure subprojects */
 subprojects {
@@ -101,11 +107,34 @@ subprojects {
     metaInf {
       from rootProject.file('LICENSE')
       from rootProject.file('NOTICE')
-    } 
+    }
   }
   jar {
     configure jarOptions
   }
+
+  task copyJar(type: Copy) {
+    def projectGroup = "$project.group".replace("quarks.", "")
+    if (["api", "providers", "runtime", "spi"].contains(projectGroup)) {
+      from jar
+      into "${rootProject.ext.buildDir}/" + "/lib"
+      rename("$jar.archiveName", "$jar.baseName.$jar.extension")
+    }else{
+      from jar
+      into "${rootProject.ext.buildDir}/" + projectGroup + "/$project.name".replaceAll(":", "/") + "/lib"
+      rename("$jar.archiveName", "$jar.baseName.$jar.extension")
+    }
+  }
+  copyJar.dependsOn assemble
+  build.dependsOn copyJar
+}
+
+task consoleWar (dependsOn: "console:servlets"){
+  copy {
+    from "console/servlets/build/webapps/"
+    into "${rootProject.ext.buildDir}/console/webapps/"
+    include "*.war"
+  }
 }
 
 task wrapper(type: Wrapper) {

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9d506899/connectors/javax.websocket-client/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/javax.websocket-client/build.gradle b/connectors/javax.websocket-client/build.gradle
index cf77445..44ca9fc 100644
--- a/connectors/javax.websocket-client/build.gradle
+++ b/connectors/javax.websocket-client/build.gradle
@@ -11,8 +11,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-archivesBaseName = project.name
-
 dependencies {
   compile project(':connectors:quarks.javax.websocket')
   compile 'org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106'

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9d506899/connectors/javax.websocket-server/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/javax.websocket-server/build.gradle b/connectors/javax.websocket-server/build.gradle
index f3ae61f..fe38489 100644
--- a/connectors/javax.websocket-server/build.gradle
+++ b/connectors/javax.websocket-server/build.gradle
@@ -11,8 +11,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-archivesBaseName = project.name
-
 dependencies {
   compile project(':connectors:javax.websocket-client')
   compile 'org.eclipse.jetty.websocket:javax-websocket-server-impl:9.3.6.v20151106'

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/9d506899/connectors/quarks.javax.websocket/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/quarks.javax.websocket/build.gradle b/connectors/quarks.javax.websocket/build.gradle
index b057c75..434dbcb 100644
--- a/connectors/quarks.javax.websocket/build.gradle
+++ b/connectors/quarks.javax.websocket/build.gradle
@@ -11,8 +11,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-archivesBaseName = project.name
-
 dependencies {
   compile 'javax.websocket:javax.websocket-api:1.0'
   testRuntime ext_classpath


[4/4] incubator-quarks git commit: Merge pull request #138

Posted by dl...@apache.org.
Merge pull request #138

This closes #138


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/67a4276a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/67a4276a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/67a4276a

Branch: refs/heads/master
Commit: 67a4276a2c9fd3ae5964909dc1ff74b73f80bad8
Parents: aa96292 37627d4
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Jun 21 11:20:12 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Jun 21 11:20:12 2016 -0400

----------------------------------------------------------------------
 build.gradle          | 62 +++++++++++++++++++++++++++++++++++++++++++---
 test/svt/build.gradle | 13 ++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[3/4] incubator-quarks git commit: make gradle build equivalent to ant's jar schema and name

Posted by dl...@apache.org.
make gradle build equivalent to ant's jar schema and name


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/37627d4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/37627d4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/37627d4e

Branch: refs/heads/master
Commit: 37627d4edebd2b767d0c4520fe3c59c208ff8a55
Parents: 2a2f323
Author: cazen <ca...@apache.org>
Authored: Mon Jun 20 07:18:59 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Mon Jun 20 08:01:10 2016 +0000

----------------------------------------------------------------------
 build.gradle                                   | 21 +++++++++++----------
 connectors/javax.websocket-client/build.gradle |  2 ++
 connectors/javax.websocket-server/build.gradle |  2 ++
 connectors/quarks.javax.websocket/build.gradle |  2 ++
 test/svt/build.gradle                          | 13 +++++++++++++
 5 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/37627d4e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 8f192b6..b89e76b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,11 @@ subprojects {
   plugins.apply 'java'
   plugins.apply 'jacoco'
 
-  archivesBaseName = "${rootProject.name}${project.path.replace(':','.')}"
+  if(["javax.websocket-client", "javax.websocket-server", "quarks.javax.websocket"].contains(project.name)) {
+    archivesBaseName = "${project.name}"
+  } else{
+    archivesBaseName = "${rootProject.name}${project.path.replace(':', '.')}"
+  }
   version = build_version
 
   jacoco {
@@ -120,22 +124,18 @@ subprojects {
       from jar
       into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/lib"
       rename("$jar.archiveName", "$jar.baseName.$jar.extension")
-    }else{
-      from jar
-      into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/$project.name".replaceAll(":", "/") + "/lib"
-      rename("$jar.archiveName", "$jar.baseName.$jar.extension")
-    }
-  }
 
-  task copySampleSrc {
-    def projectGroup = "$project.group".replace("quarks.", "")
-    if (["samples"].contains(projectGroup)) {
+      //Copy Sample SRC to dist
       copy {
         into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/src/$project.name/src/main/java/"
         from(sourceSets.main.allSource.srcDirs) {
           include '**/*.java'
         }
       }
+    }else{
+      from jar
+      into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/$project.name".replaceAll(":", "/") + "/lib"
+      rename("$jar.archiveName", "$jar.baseName.$jar.extension")
     }
   }
 
@@ -164,3 +164,4 @@ task copyScript {
 task wrapper(type: Wrapper) {
   jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar')
 }
+

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/37627d4e/connectors/javax.websocket-client/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/javax.websocket-client/build.gradle b/connectors/javax.websocket-client/build.gradle
index 44ca9fc..cf77445 100644
--- a/connectors/javax.websocket-client/build.gradle
+++ b/connectors/javax.websocket-client/build.gradle
@@ -11,6 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+archivesBaseName = project.name
+
 dependencies {
   compile project(':connectors:quarks.javax.websocket')
   compile 'org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106'

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/37627d4e/connectors/javax.websocket-server/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/javax.websocket-server/build.gradle b/connectors/javax.websocket-server/build.gradle
index fe38489..f3ae61f 100644
--- a/connectors/javax.websocket-server/build.gradle
+++ b/connectors/javax.websocket-server/build.gradle
@@ -11,6 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+archivesBaseName = project.name
+
 dependencies {
   compile project(':connectors:javax.websocket-client')
   compile 'org.eclipse.jetty.websocket:javax-websocket-server-impl:9.3.6.v20151106'

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/37627d4e/connectors/quarks.javax.websocket/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/quarks.javax.websocket/build.gradle b/connectors/quarks.javax.websocket/build.gradle
index 434dbcb..b057c75 100644
--- a/connectors/quarks.javax.websocket/build.gradle
+++ b/connectors/quarks.javax.websocket/build.gradle
@@ -11,6 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+archivesBaseName = project.name
+
 dependencies {
   compile 'javax.websocket:javax.websocket-api:1.0'
   testRuntime ext_classpath

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/37627d4e/test/svt/build.gradle
----------------------------------------------------------------------
diff --git a/test/svt/build.gradle b/test/svt/build.gradle
index 4bccc4b..805e666 100644
--- a/test/svt/build.gradle
+++ b/test/svt/build.gradle
@@ -11,9 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+def projectGroup = "$project.group".replace("quarks.", "")
+def lib= "${rootProject.ext.target_java8_dir}/" + projectGroup + "/$project.name".replaceAll(":", "/")
+
+//def lib="${project.distsDir}/lib"
+
 dependencies {
   compile project(':providers:development')
   compile project(':samples:apps')
   compile project(':connectors:iotf')
   compile ext_classpath
 }
+
+tasks.build.doFirst(){
+  mkdir lib 
+}
+
+tasks.build.doLast(){
+  delete lib
+}


[2/4] incubator-quarks git commit: Chz target dir to using distsDir

Posted by dl...@apache.org.
Chz target dir to using distsDir


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/2a2f323e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/2a2f323e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/2a2f323e

Branch: refs/heads/master
Commit: 2a2f323e93a91768f159e9f37d40aad32975a82a
Parents: 9d50689
Author: cazen <ca...@apache.org>
Authored: Tue Jun 14 01:46:42 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Tue Jun 14 01:49:41 2016 +0000

----------------------------------------------------------------------
 build.gradle | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/2a2f323e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2bbed9f..8f192b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 /* Configure root project */
+apply plugin: 'java'
 ext.commithash = {
   try {
     return "git rev-parse --short HEAD".execute().text.trim()
@@ -25,12 +26,8 @@ ext.TSTAMP = String.format('%tH%<tM', now)
 ext.ext_classpath = ['com.google.code.gson:gson:2.2.4',
   'org.slf4j:slf4j-api:1.7.12',
   'io.dropwizard.metrics:metrics-core:3.1.2']
-ext.buildDir = "${rootDir}/target/gradle"
-
-task clean(type: Delete) {
-    println "delete =  ${rootProject.ext.buildDir}"
-    delete "${rootProject.ext.buildDir}"
-}
+ext.target_dir = "$distsDir"
+ext.target_java8_dir = "${ext.target_dir}/java8"
 
 /* Configure subprojects */
 subprojects {
@@ -117,23 +114,50 @@ subprojects {
     def projectGroup = "$project.group".replace("quarks.", "")
     if (["api", "providers", "runtime", "spi"].contains(projectGroup)) {
       from jar
-      into "${rootProject.ext.buildDir}/" + "/lib"
+      into "${rootProject.ext.target_java8_dir}/" + "/lib"
+      rename("$jar.archiveName", "$jar.baseName.$jar.extension")
+    }else if(["samples"].contains(projectGroup)){
+      from jar
+      into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/lib"
       rename("$jar.archiveName", "$jar.baseName.$jar.extension")
     }else{
       from jar
-      into "${rootProject.ext.buildDir}/" + projectGroup + "/$project.name".replaceAll(":", "/") + "/lib"
+      into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/$project.name".replaceAll(":", "/") + "/lib"
       rename("$jar.archiveName", "$jar.baseName.$jar.extension")
     }
   }
+
+  task copySampleSrc {
+    def projectGroup = "$project.group".replace("quarks.", "")
+    if (["samples"].contains(projectGroup)) {
+      copy {
+        into "${rootProject.ext.target_java8_dir}/" + projectGroup + "/src/$project.name/src/main/java/"
+        from(sourceSets.main.allSource.srcDirs) {
+          include '**/*.java'
+        }
+      }
+    }
+  }
+
   copyJar.dependsOn assemble
   build.dependsOn copyJar
 }
 
 task consoleWar (dependsOn: "console:servlets"){
   copy {
-    from "console/servlets/build/webapps/"
-    into "${rootProject.ext.buildDir}/console/webapps/"
-    include "*.war"
+    includeEmptyDirs = false
+    from "${project("console:servlets").buildDir}"
+    into "${rootProject.ext.target_java8_dir}/console/"
+    include "**/*.war"
+  }
+}
+
+task copyScript {
+  copy {
+    includeEmptyDirs = false
+    from "scripts/"
+    into "${rootProject.ext.target_java8_dir}/scripts/"
+    include "**/*"
   }
 }