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/05/19 08:37:55 UTC
[14/15] incubator-quarks git commit: merge and resolve conflict
merge and resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/0fc884e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/0fc884e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/0fc884e9
Branch: refs/heads/gradle
Commit: 0fc884e94b96adeec90e185dd9b8e66f5786ace0
Parents: 4f98e17 5d4024c
Author: cazen <ca...@apache.org>
Authored: Thu May 19 07:39:01 2016 +0000
Committer: cazen <ca...@apache.org>
Committed: Thu May 19 07:39:01 2016 +0000
----------------------------------------------------------------------
api/build.gradle | 24 +++++++++++
api/function/build.gradle | 29 ++++++++++----
api/graph/build.gradle | 2 +-
build.gradle | 90 +++++++++++-------------------------------
build.xml | 5 +++
settings.gradle | 5 +++
spi/build.gradle | 23 +++++++++++
spi/graph/build.gradle | 2 +-
spi/topology/build.gradle | 2 +-
9 files changed, 106 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/api/function/build.gradle
----------------------------------------------------------------------
diff --cc api/function/build.gradle
index c4a598d,4afa2db..b4c53c8
--- a/api/function/build.gradle
+++ b/api/function/build.gradle
@@@ -1,23 -1,25 +1,38 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ext.artifact = 'api.function' // However ArtifactId can be set per artifact in publishing.publications
+description = 'The API for buidling functions'
- jar {
- manifest {
- name = 'Quarks Function API' // Becomes 'Bundle-Name' in MANIFEST
- attributes 'Implementation-Title': artifact,
- 'Class-Path' : configurations.compile.collect { it.getName() }.join(' ')
- }
- }
+ dependencies {
+ compile configurations.qext
+ }
+
+ //jar {
+ // manifest {
+ // def manifestCp = configurations.qext.files.collect {
+ // File file = it
+ // "../ext/${file.name}"
+ // }.join(' ')
+ //
+ // attributes 'Class-Path': manifestCp
+ // }
+ //}
+
+ task copyExt(type: Copy) {
+ from configurations.qext
+ into new File(targetj8, 'ext')
+ }
+
+
+ build.dependsOn(copyExt)
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/api/graph/build.gradle
----------------------------------------------------------------------
diff --cc api/graph/build.gradle
index bdc55f8,cc3edb9..700ddcb
--- a/api/graph/build.gradle
+++ b/api/graph/build.gradle
@@@ -1,19 -1,6 +1,19 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ext.artifact = 'api.graph' // However ArtifactId can be set per artifact in publishing.publications
+description = 'The graph API'
dependencies {
- compile project(':api:oplet')
+ compile project(':api/oplet')
- }
+ }
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index aa30435,7420faa..3f337a2
--- a/build.gradle
+++ b/build.gradle
@@@ -1,32 -1,12 +1,23 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
- import org.gradle.api.JavaVersion
- def minJavaVersion = JavaVersion.VERSION_1_8;
- ext.buildDir = "${rootDir}/target/gradle"
+ apply plugin: 'base'
- println "buildDir = $buildDir"
-
- allprojects {
- apply plugin: 'idea'
- apply plugin: 'eclipse'
- }
-
- task clean(type: Delete) {
-
- println "delete = ${rootProject.ext.buildDir}"
- delete "${rootProject.ext.buildDir}"
+ ext {
+ jarPrefix = 'quarks.'
+ target = file('target')
+ targetj8 = new File(target, 'java8')
}
subprojects {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/settings.gradle
----------------------------------------------------------------------
diff --cc settings.gradle
index fabf9d5,011b49c..e145f27
--- a/settings.gradle
+++ b/settings.gradle
@@@ -1,36 -1,7 +1,41 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+rootProject.name = 'quarks'
+//analytics
+include "analytics/math3", "analytics/sensors"
+// api
+include "api/execution", "api/function", "api/graph", "api/oplet", "api/topology", "api/window"
+// apps
+include "apps/iot", "apps/runtime"
+// connectors
+include "connectors/common", "connectors/file", "connectors/http", "connectors/iot", "connectors/iotf", "connectors/javax.websocket-client", "connectors/javax.websocket-server", "connectors/jdbc", "connectors/kafka", "connectors/mqtt", "connectors/pubsub", "connectors/quarks.javax.websocket", "connectors/serial", "connectors/wsclient", "connectors/wsclient-javax.websocket"
+// console
+include "console/server", "console/servlets"
+// providers
+include "providers/direct", "providers/development"
+// runtime
+include "runtime/appservice", "runtime/etiao", "runtime/jobregistry", "runtime/jmxcontrol", "runtime/jsoncontrol"
+// samples
+include "samples/apps", "samples/connectors", "samples/console", "samples/topology", "samples/utils"
+// spi
+include "spi/graph", "spi/topology"
+// utils
+include "utils/metrics"
+// test
+include "test/fvtiot", "test/svt"
+
-include "api:function", "api:oplet", "api:execution", "api:window",
- "api:graph", "api:topology",
- "spi:graph", "spi:topology"
++//include "api:function", "api:oplet", "api:execution", "api:window",
++// "api:graph", "api:topology",
++// "spi:graph", "spi:topology"
+
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/spi/graph/build.gradle
----------------------------------------------------------------------
diff --cc spi/graph/build.gradle
index 8c7cd13,d850f58..ee8a4b6
--- a/spi/graph/build.gradle
+++ b/spi/graph/build.gradle
@@@ -1,20 -1,6 +1,20 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ext.artifact = 'spi.graph' // However ArtifactId can be set per artifact in publishing.publications
+description = 'The graph SPI'
dependencies {
- compile project(':api:graph')
+ compile project(':api/graph')
+ compile project(':api/execution')
- }
+ }
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/0fc884e9/spi/topology/build.gradle
----------------------------------------------------------------------
diff --cc spi/topology/build.gradle
index cb68207,c9f6f37..09b558e
--- a/spi/topology/build.gradle
+++ b/spi/topology/build.gradle
@@@ -1,19 -1,6 +1,19 @@@
-// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-// and to You under the Apache License, Version 2.0.
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ext.artifact = 'spi.topology' // However ArtifactId can be set per artifact in publishing.publications
+description = 'The topology SPI'
dependencies {
- compile project(':api:topology')
+ compile project(':api/topology')
- }
+ }