streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [5/8] incubator-streams-examples git commit: fix licensing in twitter-history-elasticsearch
Date Sun, 18 Sep 2016 22:57:11 GMT
fix licensing in twitter-history-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/977ca238
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/977ca238
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/977ca238

Branch: refs/heads/master
Commit: 977ca2380260c549ed17539d4b5c277de4946ae4
Parents: a16df5b
Author: Steve Blackmon <sblackmon@apache.org>
Authored: Sun Sep 18 17:36:36 2016 -0500
Committer: Steve Blackmon <sblackmon@apache.org>
Committed: Sun Sep 18 17:36:36 2016 -0500

----------------------------------------------------------------------
 .../resources/TwitterHistoryElasticsearch.dot   | 20 ++++++++++++++++-
 .../src/main/resources/application.conf         | 15 +++++++++++++
 .../resources/TwitterHistoryElasticsearch.dot   | 21 ------------------
 .../src/site/resources/application.conf         | 23 --------------------
 ...witterHistoryElasticsearchConfiguration.json | 13 -----------
 5 files changed, 34 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/977ca238/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
b/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
index 525c61d..d0773df 100644
--- a/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
+++ b/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.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
   TwitterTimelineProvider [label="TwitterTimelineProvider",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java"];

http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/977ca238/local/twitter-history-elasticsearch/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/main/resources/application.conf b/local/twitter-history-elasticsearch/src/main/resources/application.conf
index c74b54b..1e12298 100644
--- a/local/twitter-history-elasticsearch/src/main/resources/application.conf
+++ b/local/twitter-history-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 {
   host = "api.twitter.com"
   endpoint = "statuses/user_timeline"

http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/977ca238/local/twitter-history-elasticsearch/src/site/resources/TwitterHistoryElasticsearch.dot
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/site/resources/TwitterHistoryElasticsearch.dot
b/local/twitter-history-elasticsearch/src/site/resources/TwitterHistoryElasticsearch.dot
deleted file mode 100644
index 525c61d..0000000
--- a/local/twitter-history-elasticsearch/src/site/resources/TwitterHistoryElasticsearch.dot
+++ /dev/null
@@ -1,21 +0,0 @@
-digraph g {
-
-  //providers
-  TwitterTimelineProvider [label="TwitterTimelineProvider",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.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"];
-  
-  //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
-  es [label="es://{index}/{type}",shape=box];
-  
-  //stream
-  TwitterTimelineProvider -> ActivityConverterProcessor [label="ObjectNode"];
-  ActivityConverterProcessor -> 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"];
-  
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/977ca238/local/twitter-history-elasticsearch/src/site/resources/application.conf
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/site/resources/application.conf b/local/twitter-history-elasticsearch/src/site/resources/application.conf
deleted file mode 100644
index c74b54b..0000000
--- a/local/twitter-history-elasticsearch/src/site/resources/application.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-twitter {
-  host = "api.twitter.com"
-  endpoint = "statuses/user_timeline"
-  oauth {
-    consumerKey = ""
-    consumerSecret = ""
-    accessToken = ""
-    accessTokenSecret = ""
-  }
-  info = [
-    "42232950"
-    "211620426"
-  ]
-}
-elasticsearch {
-  hosts = [
-    localhost
-  ]
-  port = 9300
-  clusterName = elasticsearch
-  index = twitterhistory_activity
-  type = activity
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/977ca238/local/twitter-history-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json
b/local/twitter-history-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json
deleted file mode 100644
index ea9b165..0000000
--- a/local/twitter-history-elasticsearch/src/site/resources/org/apache/streams/example/twitter/TwitterHistoryElasticsearchConfiguration.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "$license": [
-        "http://www.apache.org/licenses/LICENSE-2.0"
-    ],
-    "type": "object",
-    "javaType" : "org.apache.streams.example.twitter.TwitterHistoryElasticsearchConfiguration",
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties": {
-        "twitter": { "javaType": "org.apache.streams.twitter.TwitterUserInformationConfiguration",
"type": "object", "required": true },
-        "elasticsearch": { "javaType": "org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration",
"type": "object", "required": true }
-    }
-}


Mime
View raw message