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:08 UTC
[2/8] incubator-streams-examples git commit: fix licensing in
elasticsearch-reindex
fix licensing in elasticsearch-reindex
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/78565e5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/78565e5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/78565e5a
Branch: refs/heads/master
Commit: 78565e5a4f41b390580f1f4798c1ddf5e9fa3ddc
Parents: 2e732aa
Author: Steve Blackmon <sb...@apache.org>
Authored: Sun Sep 18 17:34:11 2016 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Sun Sep 18 17:34:11 2016 -0500
----------------------------------------------------------------------
.../ElasticsearchReindexConfiguration.json | 3 ++
.../src/main/resources/ElasticsearchReindex.dot | 20 +++++++-
.../resources/ActivityChildObjectParent.json | 15 ------
.../src/site/resources/ElasticsearchReindex.dot | 17 -------
.../ElasticsearchReindexConfiguration.json | 10 ----
.../src/site/resources/application.json | 26 ----------
.../src/site/resources/testReindex.json | 26 ----------
.../src/site/resources/testReindexChild.json | 26 ----------
.../src/site/resources/testReindexParent.json | 26 ----------
.../resources/ActivityChildObjectParent.json | 3 ++
.../src/test/resources/testReindex.json | 50 ++++++++++----------
.../src/test/resources/testReindexChild.json | 50 ++++++++++----------
.../src/test/resources/testReindexParent.json | 50 ++++++++++----------
13 files changed, 103 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/main/jsonschema/ElasticsearchReindexConfiguration.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/main/jsonschema/ElasticsearchReindexConfiguration.json b/local/elasticsearch-reindex/src/main/jsonschema/ElasticsearchReindexConfiguration.json
index ffdc4d8..1237538 100644
--- a/local/elasticsearch-reindex/src/main/jsonschema/ElasticsearchReindexConfiguration.json
+++ b/local/elasticsearch-reindex/src/main/jsonschema/ElasticsearchReindexConfiguration.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.elasticsearch.example.ElasticsearchReindexConfiguration",
"javaInterfaces": ["java.io.Serializable"],
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot b/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
index 52456a9..013d158 100644
--- a/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
+++ b/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.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
ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/site/resources/ActivityChildObjectParent.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/ActivityChildObjectParent.json b/local/elasticsearch-reindex/src/site/resources/ActivityChildObjectParent.json
deleted file mode 100644
index 963fbe7..0000000
--- a/local/elasticsearch-reindex/src/site/resources/ActivityChildObjectParent.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "template": "*",
- "order": 100,
- "mappings": {
- "object": {
- "dynamic": true
- },
- "activity": {
- "_parent": {
- "type": "object"
- },
- "dynamic": true
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindex.dot
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindex.dot b/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindex.dot
deleted file mode 100644
index 52456a9..0000000
--- a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindex.dot
+++ /dev/null
@@ -1,17 +0,0 @@
-digraph g {
-
- //providers
- ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.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="es://{indexes}/{types}",shape=box];
- destination [label="es://{index}/{type}",shape=box];
-
- //stream
- source -> ElasticsearchPersistReader
- ElasticsearchPersistReader -> ElasticsearchPersistWriter [label="String"];
- ElasticsearchPersistWriter -> destination
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindexConfiguration.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindexConfiguration.json b/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindexConfiguration.json
deleted file mode 100644
index ffdc4d8..0000000
--- a/local/elasticsearch-reindex/src/site/resources/ElasticsearchReindexConfiguration.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "type": "object",
- "javaType" : "org.apache.streams.elasticsearch.example.ElasticsearchReindexConfiguration",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "source": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchReaderConfiguration", "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/78565e5a/local/elasticsearch-reindex/src/site/resources/application.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/application.json b/local/elasticsearch-reindex/src/site/resources/application.json
deleted file mode 100644
index 567b19d..0000000
--- a/local/elasticsearch-reindex/src/site/resources/application.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "activity"
- ],
- "types": [
- "activity"
- ],
- "forceUseConfig": true
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "activity2",
- "type": "activity",
- "forceUseConfig": true
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/site/resources/testReindex.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/testReindex.json b/local/elasticsearch-reindex/src/site/resources/testReindex.json
deleted file mode 100644
index 0cc5aa0..0000000
--- a/local/elasticsearch-reindex/src/site/resources/testReindex.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "activity"
- ]
- },
- "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/78565e5a/local/elasticsearch-reindex/src/site/resources/testReindexChild.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/testReindexChild.json b/local/elasticsearch-reindex/src/site/resources/testReindexChild.json
deleted file mode 100644
index 0cc5aa0..0000000
--- a/local/elasticsearch-reindex/src/site/resources/testReindexChild.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "activity"
- ]
- },
- "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/78565e5a/local/elasticsearch-reindex/src/site/resources/testReindexParent.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/site/resources/testReindexParent.json b/local/elasticsearch-reindex/src/site/resources/testReindexParent.json
deleted file mode 100644
index c601cea..0000000
--- a/local/elasticsearch-reindex/src/site/resources/testReindexParent.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "object"
- ]
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "object",
- "forceUseConfig": true
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/test/resources/ActivityChildObjectParent.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/test/resources/ActivityChildObjectParent.json b/local/elasticsearch-reindex/src/test/resources/ActivityChildObjectParent.json
index 963fbe7..1fa8f13 100644
--- a/local/elasticsearch-reindex/src/test/resources/ActivityChildObjectParent.json
+++ b/local/elasticsearch-reindex/src/test/resources/ActivityChildObjectParent.json
@@ -1,4 +1,7 @@
{
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
"template": "*",
"order": 100,
"mappings": {
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/78565e5a/local/elasticsearch-reindex/src/test/resources/testReindex.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/test/resources/testReindex.json b/local/elasticsearch-reindex/src/test/resources/testReindex.json
index 0cc5aa0..dbc8c18 100644
--- a/local/elasticsearch-reindex/src/test/resources/testReindex.json
+++ b/local/elasticsearch-reindex/src/test/resources/testReindex.json
@@ -1,26 +1,28 @@
{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "activity"
- ]
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "activity",
- "forceUseConfig": true
- }
-
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
+ "source": {
+ "hosts": [
+ "localhost"
+ ],
+ "port": 9300,
+ "clusterName": "elasticsearch",
+ "indexes": [
+ "source"
+ ],
+ "types": [
+ "activity"
+ ]
+ },
+ "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/78565e5a/local/elasticsearch-reindex/src/test/resources/testReindexChild.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/test/resources/testReindexChild.json b/local/elasticsearch-reindex/src/test/resources/testReindexChild.json
index 0cc5aa0..dbc8c18 100644
--- a/local/elasticsearch-reindex/src/test/resources/testReindexChild.json
+++ b/local/elasticsearch-reindex/src/test/resources/testReindexChild.json
@@ -1,26 +1,28 @@
{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "activity"
- ]
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "activity",
- "forceUseConfig": true
- }
-
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
+ "source": {
+ "hosts": [
+ "localhost"
+ ],
+ "port": 9300,
+ "clusterName": "elasticsearch",
+ "indexes": [
+ "source"
+ ],
+ "types": [
+ "activity"
+ ]
+ },
+ "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/78565e5a/local/elasticsearch-reindex/src/test/resources/testReindexParent.json
----------------------------------------------------------------------
diff --git a/local/elasticsearch-reindex/src/test/resources/testReindexParent.json b/local/elasticsearch-reindex/src/test/resources/testReindexParent.json
index c601cea..3d7568a 100644
--- a/local/elasticsearch-reindex/src/test/resources/testReindexParent.json
+++ b/local/elasticsearch-reindex/src/test/resources/testReindexParent.json
@@ -1,26 +1,28 @@
{
- "source": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "indexes": [
- "source"
- ],
- "types": [
- "object"
- ]
- },
- "destination": {
- "hosts": [
- "localhost"
- ],
- "port": 9300,
- "clusterName": "elasticsearch",
- "index": "destination",
- "type": "object",
- "forceUseConfig": true
- }
-
+ "$license": [
+ "http://www.apache.org/licenses/LICENSE-2.0"
+ ],
+ "source": {
+ "hosts": [
+ "localhost"
+ ],
+ "port": 9300,
+ "clusterName": "elasticsearch",
+ "indexes": [
+ "source"
+ ],
+ "types": [
+ "object"
+ ]
+ },
+ "destination": {
+ "hosts": [
+ "localhost"
+ ],
+ "port": 9300,
+ "clusterName": "elasticsearch",
+ "index": "destination",
+ "type": "object",
+ "forceUseConfig": true
+ }
}