Repository: incubator-streams-examples Updated Branches: refs/heads/master 816fcff89 -> 3e91ab1da
fix licensing in elasticsearch-hdfs 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/2e732aad Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/2e732aad Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/2e732aad Branch: refs/heads/master Commit: 2e732aadf767b7d154771cf4e345d7b68590dc19 Parents: 816fcff Author: Steve Blackmon <sblack...@apache.org> Authored: Sun Sep 18 17:32:27 2016 -0500 Committer: Steve Blackmon <sblack...@apache.org> Committed: Sun Sep 18 17:32:27 2016 -0500 ---------------------------------------------------------------------- .../ElasticsearchHdfsConfiguration.json | 3 ++ .../HdfsElasticsearchConfiguration.json | 3 ++ .../src/main/resources/ElasticsearchHdfs.dot | 20 ++++++++- .../src/main/resources/HdfsElasticsearch.dot | 20 ++++++++- .../src/site/resources/ElasticsearchHdfs.dot | 17 -------- .../ElasticsearchHdfsConfiguration.json | 10 ----- .../src/site/resources/HdfsElasticsearch.dot | 17 -------- .../HdfsElasticsearchConfiguration.json | 10 ----- .../src/site/resources/testBackup.json | 24 ---------- .../src/site/resources/testRestore.json | 20 --------- .../src/test/resources/testBackup.json | 46 ++++++++++---------- .../src/test/resources/testRestore.json | 38 ++++++++-------- 12 files changed, 88 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/main/jsonschema/ElasticsearchHdfsConfiguration.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/main/jsonschema/ElasticsearchHdfsConfiguration.json b/local/elasticsearch-hdfs/src/main/jsonschema/ElasticsearchHdfsConfiguration.json index 91324dd..9ad7e54 100644 --- a/local/elasticsearch-hdfs/src/main/jsonschema/ElasticsearchHdfsConfiguration.json +++ b/local/elasticsearch-hdfs/src/main/jsonschema/ElasticsearchHdfsConfiguration.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.ElasticsearchHdfsConfiguration", "javaInterfaces": ["java.io.Serializable"], http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/main/jsonschema/HdfsElasticsearchConfiguration.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/main/jsonschema/HdfsElasticsearchConfiguration.json b/local/elasticsearch-hdfs/src/main/jsonschema/HdfsElasticsearchConfiguration.json index c8072ba..8b77225 100644 --- a/local/elasticsearch-hdfs/src/main/jsonschema/HdfsElasticsearchConfiguration.json +++ b/local/elasticsearch-hdfs/src/main/jsonschema/HdfsElasticsearchConfiguration.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.HdfsElasticsearchConfiguration", "javaInterfaces": ["java.io.Serializable"], http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot b/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot index c953522..5e90270 100644 --- a/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot +++ b/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.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/2e732aad/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot b/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot index f9a0efa..3548abc 100644 --- a/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot +++ b/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.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 WebHdfsPersistReader [label="WebHdfsPersistReader",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/2e732aad/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfs.dot ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfs.dot b/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfs.dot deleted file mode 100644 index c953522..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfs.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 - WebHdfsPersistWriter [label="WebHdfsPersistWriter",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="hdfs://{index}/{type}",shape=box]; - - //stream - source -> ElasticsearchPersistReader - ElasticsearchPersistReader -> WebHdfsPersistWriter [label="String"]; - WebHdfsPersistWriter -> destination -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfsConfiguration.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfsConfiguration.json b/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfsConfiguration.json deleted file mode 100644 index 91324dd..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/ElasticsearchHdfsConfiguration.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-03/schema";, - "type": "object", - "javaType" : "org.apache.streams.elasticsearch.example.ElasticsearchHdfsConfiguration", - "javaInterfaces": ["java.io.Serializable"], - "properties": { - "source": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchReaderConfiguration", "type": "object", "required": true }, - "destination": { "javaType": "org.apache.streams.hdfs.HdfsWriterConfiguration", "type": "object", "required": true } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearch.dot ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearch.dot b/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearch.dot deleted file mode 100644 index f9a0efa..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearch.dot +++ /dev/null @@ -1,17 +0,0 @@ -digraph g { - - //providers - WebHdfsPersistReader [label="WebHdfsPersistReader",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="hdfs://{indexes}/{types}",shape=box]; - destination [label="es://{index}/{type}",shape=box]; - - //stream - source -> WebHdfsPersistReader - WebHdfsPersistReader -> ElasticsearchPersistWriter [label="String"]; - ElasticsearchPersistWriter -> destination -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearchConfiguration.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearchConfiguration.json b/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearchConfiguration.json deleted file mode 100644 index c8072ba..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/HdfsElasticsearchConfiguration.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-03/schema";, - "type": "object", - "javaType" : "org.apache.streams.elasticsearch.example.HdfsElasticsearchConfiguration", - "javaInterfaces": ["java.io.Serializable"], - "properties": { - "source": { "javaType": "org.apache.streams.hdfs.HdfsReaderConfiguration", "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/2e732aad/local/elasticsearch-hdfs/src/site/resources/testBackup.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/testBackup.json b/local/elasticsearch-hdfs/src/site/resources/testBackup.json deleted file mode 100644 index 2002cb8..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/testBackup.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "source": { - "hosts": [ - "localhost" - ], - "port": 9300, - "clusterName": "elasticsearch", - "indexes": [ - "source" - ], - "types": [ - "activity" - ] - }, - "destination": { - "scheme": "file", - "host": "localhost", - "user": "cloudera", - "path": "target", - "writerPath": "test", - "writerFilePrefix": "activities" - } - -} http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/site/resources/testRestore.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/site/resources/testRestore.json b/local/elasticsearch-hdfs/src/site/resources/testRestore.json deleted file mode 100644 index 63b42c5..0000000 --- a/local/elasticsearch-hdfs/src/site/resources/testRestore.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "source": { - "scheme": "file", - "host": "localhost", - "user": "cloudera", - "path": "target", - "readerPath": "test" - }, - "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/2e732aad/local/elasticsearch-hdfs/src/test/resources/testBackup.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/test/resources/testBackup.json b/local/elasticsearch-hdfs/src/test/resources/testBackup.json index 2002cb8..06268e4 100644 --- a/local/elasticsearch-hdfs/src/test/resources/testBackup.json +++ b/local/elasticsearch-hdfs/src/test/resources/testBackup.json @@ -1,24 +1,26 @@ { - "source": { - "hosts": [ - "localhost" - ], - "port": 9300, - "clusterName": "elasticsearch", - "indexes": [ - "source" - ], - "types": [ - "activity" - ] - }, - "destination": { - "scheme": "file", - "host": "localhost", - "user": "cloudera", - "path": "target", - "writerPath": "test", - "writerFilePrefix": "activities" - } - + "$license": [ + "http://www.apache.org/licenses/LICENSE-2.0"; + ], + "source": { + "hosts": [ + "localhost" + ], + "port": 9300, + "clusterName": "elasticsearch", + "indexes": [ + "source" + ], + "types": [ + "activity" + ] + }, + "destination": { + "scheme": "file", + "host": "localhost", + "user": "cloudera", + "path": "target", + "writerPath": "test", + "writerFilePrefix": "activities" + } } http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/2e732aad/local/elasticsearch-hdfs/src/test/resources/testRestore.json ---------------------------------------------------------------------- diff --git a/local/elasticsearch-hdfs/src/test/resources/testRestore.json b/local/elasticsearch-hdfs/src/test/resources/testRestore.json index 63b42c5..749ec25 100644 --- a/local/elasticsearch-hdfs/src/test/resources/testRestore.json +++ b/local/elasticsearch-hdfs/src/test/resources/testRestore.json @@ -1,20 +1,22 @@ { - "source": { - "scheme": "file", - "host": "localhost", - "user": "cloudera", - "path": "target", - "readerPath": "test" - }, - "destination": { - "hosts": [ - "localhost" - ], - "port": 9300, - "clusterName": "elasticsearch", - "index": "destination", - "type": "activity", - "forceUseConfig": true - } - + "$license": [ + "http://www.apache.org/licenses/LICENSE-2.0"; + ], + "source": { + "scheme": "file", + "host": "localhost", + "user": "cloudera", + "path": "target", + "readerPath": "test" + }, + "destination": { + "hosts": [ + "localhost" + ], + "port": 9300, + "clusterName": "elasticsearch", + "index": "destination", + "type": "activity", + "forceUseConfig": true + } }
