You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/09/18 22:57:09 UTC
[3/8] incubator-streams-examples git commit: fix licensing in
mongo-elasticsearch-sync
fix licensing in mongo-elasticsearch-sync
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/342c1ba8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/342c1ba8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/342c1ba8
Branch: refs/heads/master
Commit: 342c1ba8c8331e2452c6a0a3eed98aa419629952
Parents: 78565e5
Author: Steve Blackmon <sb...@apache.org>
Authored: Sun Sep 18 17:34:30 2016 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Sun Sep 18 17:34:30 2016 -0500
----------------------------------------------------------------------
.../MongoElasticsearchSyncConfiguration.json | 3 +++
.../main/resources/MongoElasticsearchSync.dot | 20 +++++++++++++++++++-
.../src/main/resources/application.json | 3 +++
.../site/resources/MongoElasticsearchSync.dot | 18 ------------------
.../MongoElasticsearchSyncConfiguration.json | 10 ----------
.../src/site/resources/application.json | 17 -----------------
.../src/site/resources/testSync.json | 18 ------------------
.../src/test/resources/testSync.json | 3 +++
8 files changed, 28 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/main/jsonschema/MongoElasticsearchSyncConfiguration.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/main/jsonschema/MongoElasticsearchSyncConfiguration.json b/local/mongo-elasticsearch-sync/src/main/jsonschema/MongoElasticsearchSyncConfiguration.json
index a592699..8f9fed2 100644
--- a/local/mongo-elasticsearch-sync/src/main/jsonschema/MongoElasticsearchSyncConfiguration.json
+++ b/local/mongo-elasticsearch-sync/src/main/jsonschema/MongoElasticsearchSyncConfiguration.json
@@ -1,5 +1,8 @@
{
"$schema": "http://json-schema.org/draft-03/schema",
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"type": "object",
"javaType" : "org.apache.streams.example.elasticsearch.MongoElasticsearchSyncConfiguration",
"javaInterfaces": ["java.io.Serializable"],
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/main/resources/MongoElasticsearchSync.dot
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/main/resources/MongoElasticsearchSync.dot b/local/mongo-elasticsearch-sync/src/main/resources/MongoElasticsearchSync.dot
index e3babf5..a81d6b4 100644
--- a/local/mongo-elasticsearch-sync/src/main/resources/MongoElasticsearchSync.dot
+++ b/local/mongo-elasticsearch-sync/src/main/resources/MongoElasticsearchSync.dot
@@ -1,4 +1,22 @@
-digraph g {
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+ digraph g {
//providers
MongoPersistReader [label="MongoPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java"];
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/main/resources/application.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/main/resources/application.json b/local/mongo-elasticsearch-sync/src/main/resources/application.json
index facb336..99cc598 100644
--- a/local/mongo-elasticsearch-sync/src/main/resources/application.json
+++ b/local/mongo-elasticsearch-sync/src/main/resources/application.json
@@ -1,4 +1,7 @@
{
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"source": {
"host": "localhost",
"port": 27017,
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSync.dot
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSync.dot b/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSync.dot
deleted file mode 100644
index e3babf5..0000000
--- a/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSync.dot
+++ /dev/null
@@ -1,18 +0,0 @@
-digraph g {
-
- //providers
- MongoPersistReader [label="MongoPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java"];
-
- //persisters
- ElasticsearchPersistWriter [label="ElasticsearchPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java"];
-
- //data
- source [label="mongdb://{db}/{collection}",shape=box];
- destination [label="es://{index}/{type}",shape=box];
-
- //stream
- source -> MongoPersistReader [label="ObjectNode"];
- MongoPersistReader -> ElasticsearchPersistWriter [label="ObjectNode"];
- ElasticsearchPersistWriter -> destination [label="ObjectNode"];
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSyncConfiguration.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSyncConfiguration.json b/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSyncConfiguration.json
deleted file mode 100644
index a592699..0000000
--- a/local/mongo-elasticsearch-sync/src/site/resources/MongoElasticsearchSyncConfiguration.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "type": "object",
- "javaType" : "org.apache.streams.example.elasticsearch.MongoElasticsearchSyncConfiguration",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "source": { "javaType": "org.apache.streams.mongo.MongoConfiguration", "type": "object", "required": true },
- "destination": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration", "type": "object", "required": true }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/site/resources/application.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/site/resources/application.json b/local/mongo-elasticsearch-sync/src/site/resources/application.json
deleted file mode 100644
index facb336..0000000
--- a/local/mongo-elasticsearch-sync/src/site/resources/application.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "source": {
- "host": "localhost",
- "port": 27017,
- "db": "streams",
- "collection": "activities"
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "activity"
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/site/resources/testSync.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/site/resources/testSync.json b/local/mongo-elasticsearch-sync/src/site/resources/testSync.json
deleted file mode 100644
index b678c21..0000000
--- a/local/mongo-elasticsearch-sync/src/site/resources/testSync.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "source": {
- "host": "localhost",
- "port": 37017,
- "db": "local",
- "collection": "activities"
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "activity",
- "forceUseConfig": true
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/342c1ba8/local/mongo-elasticsearch-sync/src/test/resources/testSync.json
----------------------------------------------------------------------
diff --git a/local/mongo-elasticsearch-sync/src/test/resources/testSync.json b/local/mongo-elasticsearch-sync/src/test/resources/testSync.json
index b678c21..8a77262 100644
--- a/local/mongo-elasticsearch-sync/src/test/resources/testSync.json
+++ b/local/mongo-elasticsearch-sync/src/test/resources/testSync.json
@@ -1,4 +1,7 @@
{
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"source": {
"host": "localhost",
"port": 37017,