You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/11/10 02:53:36 UTC
incubator-apex-malhar git commit: Removed DataTorrent & Malhar
copyrights. Changed DataTorrent platform wording to Apex platform
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/release-3.2 f08639139 -> 55e9b8f5a
Removed DataTorrent & Malhar copyrights. Changed DataTorrent platform wording to Apex platform
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/55e9b8f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/55e9b8f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/55e9b8f5
Branch: refs/heads/release-3.2
Commit: 55e9b8f5a5bf4563eb90514c1a84535b4d9f51d6
Parents: f086391
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Mon Nov 9 17:05:42 2015 -0800
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Mon Nov 9 17:05:42 2015 -0800
----------------------------------------------------------------------
apps/logstream/src/main/html/index.php | 7 +-----
.../datatorrent/apps/logstream/Application.java | 2 +-
.../com/datatorrent/benchmark/package-info.java | 6 ++---
.../java/com/datatorrent/contrib/solr/README.md | 4 ++--
.../splunk/SplunkInputFromForwarder.java | 2 +-
demos/frauddetect/pom.xml | 2 +-
demos/machinedata/src/main/html/index.php | 7 +-----
.../datatorrent/demos/mobile/Application.java | 24 +++++++++-----------
.../src/main/resources/mrdebugger.html | 2 +-
demos/pi/pom.xml | 2 +-
demos/r/pom.xml | 2 +-
demos/wordcount/pom.xml | 2 +-
demos/yahoofinance/pom.xml | 2 +-
docs/CodingConventionsAndStyle.md | 2 +-
14 files changed, 27 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/apps/logstream/src/main/html/index.php
----------------------------------------------------------------------
diff --git a/apps/logstream/src/main/html/index.php b/apps/logstream/src/main/html/index.php
index 3db53bc..9ec09e5 100644
--- a/apps/logstream/src/main/html/index.php
+++ b/apps/logstream/src/main/html/index.php
@@ -16,10 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-<!--
- -- Copyright (c) 2012-2013 DataTorrent, Inc.
- -- All Rights Reserved.
- -->
<!-- ## Siteops is deprecated, please use logstream instead ## -->
@@ -27,7 +23,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Data Torrent : Site Operations Demo </title>
+<title>Site Operations Demo </title>
<link rel="stylesheet" type="text/css" href="malhar.css">
@@ -39,7 +35,6 @@ google.load('visualization', '1', {'packages':['table']});
</script>
-<!-- DataTorrent charting utils -->
<script type="text/javascript" src="global.js"></script>
<script type="text/javascript" src="DrawPageViewTimeChart.js"></script>
<script type="text/javascript" src="TopUrlChart.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
----------------------------------------------------------------------
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
index a595d16..0cd3f79 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
@@ -50,7 +50,7 @@ import com.datatorrent.contrib.redis.RedisMapOutputOperator;
import com.datatorrent.contrib.redis.RedisNumberSummationMapOutputOperator;
/**
- * Log stream processing application based on DataTorrent platform.<br>
+ * Log stream processing application based on Apex platform.<br>
* This application consumes log data generated by running systems and services
* in near real-time, and processes it to produce actionable data. This in turn
* can be used to produce alerts, take corrective actions, or predict system
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java b/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
index 7238b1a..b015015 100644
--- a/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
+++ b/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * DataTorrent performance demonstration application.
- */
+/**
+ * Apex malhar performance demonstration application.
+ */
package com.datatorrent.benchmark;
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/contrib/src/main/java/com/datatorrent/contrib/solr/README.md
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/README.md b/contrib/src/main/java/com/datatorrent/contrib/solr/README.md
index 2910d56..e5ee06f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/solr/README.md
+++ b/contrib/src/main/java/com/datatorrent/contrib/solr/README.md
@@ -2,9 +2,9 @@ Solr:
====
Solr is a search platform from apache Lucene. Its major features include powerful full-text search, hit highlighting, faceted search, near real-time indexing, dynamic clustering, database integration, rich document (e.g., Word, PDF) handling, and geospatial search. Solr is highly reliable, scalable and fault tolerant, providing distributed indexing, replication and load-balanced querying, automated failover and recovery and more.
-Solr with DataTorrent:
+Solr with Apex:
=====================
-Solr search platform can be intergrated with datatorrent for variety of purposes for use cases ranging from simple keyword search to ranking, scoring, classification etc.
+Solr search platform can be intergrated with Apex for variety of purposes for use cases ranging from simple keyword search to ranking, scoring, classification etc.
Solr InputOperator:
==================
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java b/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
index 782b8d1..8a5fa5d 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
@@ -32,7 +32,7 @@ import java.util.Properties;
/**
*
* An abstract class which receives input from a splunk forwarder and writes the lines to kafka.
- * A kafka input operator can be used to read these lines in a DataTorrent application.
+ * A kafka input operator can be used to read these lines in an Apex application.
*
* @param <T> the type of data to be stored into kafka
* @since 1.0.4
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 5b9614a..0981b4e 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>Apache Apex Malhar (incubating) Fraud Detect Demo</name>
- <description>DataTorrent demo applications that demonstrates real-time pattern detection in the incoming data and alerting. The demo processes streaming credit card transactions and looks for fraudulent transactions.</description>
+ <description>Apex demo application that demonstrates real-time pattern detection in the incoming data and alerting. The demo processes streaming credit card transactions and looks for fraudulent transactions.</description>
<parent>
<groupId>org.apache.apex</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/machinedata/src/main/html/index.php
----------------------------------------------------------------------
diff --git a/demos/machinedata/src/main/html/index.php b/demos/machinedata/src/main/html/index.php
index aa1aadc..6b93570 100644
--- a/demos/machinedata/src/main/html/index.php
+++ b/demos/machinedata/src/main/html/index.php
@@ -16,16 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-<!--
- -- Copyright (c) 2012-2013 Malhar, Inc.
- -- All Rights Reserved.
- -->
-
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Data Torrent : Machine Generated Data Demo </title>
+<title>Machine Generated Data Demo </title>
<link rel="stylesheet" type="text/css" href="malhar.css">
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
----------------------------------------------------------------------
diff --git a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
index d0779b3..9d9f31b 100644
--- a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
+++ b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
@@ -18,28 +18,26 @@
*/
package com.datatorrent.demos.mobile;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Random;
-
-import org.apache.commons.lang.mutable.MutableLong;
-import org.apache.commons.lang3.Range;
-import org.apache.hadoop.conf.Configuration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.datatorrent.api.Context.OperatorContext;
import com.datatorrent.api.DAG;
import com.datatorrent.api.StatsListener;
import com.datatorrent.api.StreamingApplication;
import com.datatorrent.api.annotation.ApplicationAnnotation;
-
import com.datatorrent.lib.counters.BasicCounters;
import com.datatorrent.lib.io.PubSubWebSocketInputOperator;
import com.datatorrent.lib.io.PubSubWebSocketOutputOperator;
import com.datatorrent.lib.partitioner.StatelessThroughputBasedPartitioner;
import com.datatorrent.lib.testbench.RandomEventGenerator;
+import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.Range;
+import org.apache.hadoop.conf.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Random;
/**
* Mobile Demo Application:
@@ -47,7 +45,7 @@ import com.datatorrent.lib.testbench.RandomEventGenerator;
* This demo simulates large number of cell phones in the range of 40K to 200K
* and tracks a given cell number across cell towers. It also displays the changing locations of the cell number on a google map.
*
- * This demo demonstrates the scalability feature of Datatorrent platform.
+ * This demo demonstrates the scalability feature of the Apex platform.
* It showcases the ability of the platform to scale up and down as the phone numbers generated increase and decrease respectively.
* If the tuples processed per second by the pmove operator increase beyond 30,000, more partitions of the pmove operator gets deployed until
* each of the partition processes around 10000 to 30000 tuples per second.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/mrmonitor/src/main/resources/mrdebugger.html
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/src/main/resources/mrdebugger.html b/demos/mrmonitor/src/main/resources/mrdebugger.html
index 3d53c97..d8e6497 100644
--- a/demos/mrmonitor/src/main/resources/mrdebugger.html
+++ b/demos/mrmonitor/src/main/resources/mrdebugger.html
@@ -21,7 +21,7 @@
<!doctype html>
<html>
<head>
-<title>DataTorrent Mobile Demo</title>
+<title>Mobile Demo</title>
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index d1a4670..70957cb 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>Apache Apex Malhar (incubating) Pi Demo</name>
- <description>DataTorrent demo applications that calculate the value of Pi. This is a starting point to understand how DataTorrent works.</description>
+ <description>Apex demo applications that calculate the value of Pi. This is a starting point to understand how Apex works.</description>
<parent>
<groupId>org.apache.apex</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 4c8eb78..13b9610 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>Apache Apex Malhar (incubating) R Demo</name>
- <description>DataTorrent demo applications for using R.</description>
+ <description>Apex demo applications for using R.</description>
<parent>
<groupId>org.apache.apex</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index fb06aec..026a3c3 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>Apache Apex Malhar (incubating) Wordcount Demo</name>
- <description>A very simple application that demonstrates DataTorrent Platform’s streaming window feature.</description>
+ <description>A very simple application that demonstrates Apex Platform’s streaming window feature.</description>
<parent>
<groupId>org.apache.apex</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index c98a192..dcefedd 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>Apache Apex Malhar (incubating) Yahoo! Finance Demo</name>
- <description>DataTorrent demo applications that get Yahoo finance feed and calculate minute price range, minute volume and simple moving average.</description>
+ <description>Apex demo applications that get Yahoo finance feed and calculate minute price range, minute volume and simple moving average.</description>
<parent>
<groupId>org.apache.apex</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/55e9b8f5/docs/CodingConventionsAndStyle.md
----------------------------------------------------------------------
diff --git a/docs/CodingConventionsAndStyle.md b/docs/CodingConventionsAndStyle.md
index 46d8994..154f1de 100644
--- a/docs/CodingConventionsAndStyle.md
+++ b/docs/CodingConventionsAndStyle.md
@@ -1,7 +1,7 @@
Coding Conventions and Style
==============================
-Malhar GitHub repository contains operator library and demos built on top of the DataTorrent platform. The code is open source, viewable and downloadable by all. Anyone can make code submissions to the repository to add new features or fix bugs. The process to do so is to first make a personal fork of the repository, make changes in the fork and then generate a pull request with the changes against the Malhar repository.
+Malhar GitHub repository contains operator library and demos built on top of the Apex platform. The code is open source, viewable and downloadable by all. Anyone can make code submissions to the repository to add new features or fix bugs. The process to do so is to first make a personal fork of the repository, make changes in the fork and then generate a pull request with the changes against the Malhar repository.
Malhar administrators look at pull requests regularly and merge them into the repository. The pull requests have to follow certain guidelines in order to minimize the possibility of issues and problems arising from the merge, to keep the code maintainable going forward and to keep the licensing. The guidelines are as follows