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:12 UTC
[6/8] incubator-streams-examples git commit: fix licensing in
twitter-userstream-elasticsearch
fix licensing in twitter-userstream-elasticsearch
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/182495a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/182495a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/182495a3
Branch: refs/heads/master
Commit: 182495a3a7e6598827f7daccfa0603195c88ccaf
Parents: 977ca23
Author: Steve Blackmon <sb...@apache.org>
Authored: Sun Sep 18 17:36:50 2016 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Sun Sep 18 17:36:50 2016 -0500
----------------------------------------------------------------------
.../twitter/TwitterUserstreamElasticsearch.json | 1 -
.../TwitterUserstreamElasticsearch.dot | 20 +++++++++++++-
.../src/main/resources/application.conf | 15 +++++++++++
.../TwitterUserstreamElasticsearch.dot | 28 --------------------
.../src/site/resources/application.conf | 22 ---------------
.../twitter/TwitterUserstreamElasticsearch.json | 14 ----------
6 files changed, 34 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json b/local/twitter-userstream-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
index d2167a8..6a25850 100644
--- a/local/twitter-userstream-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
+++ b/local/twitter-userstream-elasticsearch/src/main/jsonschema/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
@@ -1,7 +1,6 @@
{
"$schema": "http://json-schema.org/draft-03/schema",
"$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
"type": "object",
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot b/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
index c876176..b8d27e2 100644
--- a/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
+++ b/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.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
TwitterStreamProvider [label="TwitterStreamProvider",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java"];
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/main/resources/application.conf b/local/twitter-userstream-elasticsearch/src/main/resources/application.conf
index 50d48b5..ef5f023 100644
--- a/local/twitter-userstream-elasticsearch/src/main/resources/application.conf
+++ b/local/twitter-userstream-elasticsearch/src/main/resources/application.conf
@@ -1,3 +1,18 @@
+# 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
+#
+# 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.
twitter {
endpoint = "userstream"
oauth {
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/site/resources/TwitterUserstreamElasticsearch.dot
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/site/resources/TwitterUserstreamElasticsearch.dot b/local/twitter-userstream-elasticsearch/src/site/resources/TwitterUserstreamElasticsearch.dot
deleted file mode 100644
index c876176..0000000
--- a/local/twitter-userstream-elasticsearch/src/site/resources/TwitterUserstreamElasticsearch.dot
+++ /dev/null
@@ -1,28 +0,0 @@
-digraph g {
-
- //providers
- TwitterStreamProvider [label="TwitterStreamProvider",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java"];
-
- //processors
- ActivityConverterProcessor [label="ActivityConverterProcessor",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java"];
- DeleteOnlyProcessor [label="VerbDefinitionKeepFilter (verb:delete)",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java"];
- NoDeletesProcessor [label="VerbDefinitionDropFilter (verb:delete)",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java"];
- SetDeleteIdProcessor [label="SetDeleteIdProcessor (verb:post)",shape=box,URL="https://github.com/apache/incubator-streams-examples/blob/master/local/twitter-userstream-elasticsearch/src/main/java/org/apache/streams/twitter/example/TwitterUserstreamElasticsearch.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"];
- ElasticsearchPersistDeleter [label="ElasticsearchPersistDeleter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java"];
-
- //data
- es [label="es://{index}/{type}",shape=box];
-
- //stream
- TwitterStreamProvider -> ActivityConverterProcessor [label="ObjectNode"];
- ActivityConverterProcessor -> DeleteOnlyProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
- ActivityConverterProcessor -> NoDeletesProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
- DeleteOnlyProcessor -> SetDeleteIdProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
- NoDeletesProcessor -> ElasticsearchPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
- ElasticsearchPersistWriter -> es [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
- SetDeleteIdProcessor -> ElasticsearchPersistDeleter [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/delete.json"];
- ElasticsearchPersistDeleter -> es [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/delete.json"];
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/site/resources/application.conf
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/site/resources/application.conf b/local/twitter-userstream-elasticsearch/src/site/resources/application.conf
deleted file mode 100644
index 50d48b5..0000000
--- a/local/twitter-userstream-elasticsearch/src/site/resources/application.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-twitter {
- endpoint = "userstream"
- oauth {
- consumerKey = ""
- consumerSecret = ""
- accessToken = ""
- accessTokenSecret = ""
- }
- follow = [
-\u2002 \u2002 \u2002 \u2002 \u2002 \u2002
-\u2002 \u2002 ]
-}
-elasticsearch {
- hosts = [
- localhost
- ]
- port = 9300
- clusterName = elasticsearch
- index = userstream_activity
- type = activity
- batchSize = 1
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/182495a3/local/twitter-userstream-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json b/local/twitter-userstream-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
deleted file mode 100644
index d2167a8..0000000
--- a/local/twitter-userstream-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterUserstreamElasticsearch.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "type": "object",
- "javaType" : "org.apache.streams.example.twitter.TwitterUserstreamElasticsearchConfiguration",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "twitter": { "javaType": "org.apache.streams.twitter.TwitterStreamConfiguration", "type": "object", "required": true },
- "elasticsearch": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration", "type": "object", "required": true }
- }
-}
\ No newline at end of file