Merge branch 'STREAMS-309' into STREAMS-401
# Conflicts:
# local/elasticsearch-hdfs/pom.xml
# local/elasticsearch-reindex/pom.xml
# local/mongo-elasticsearch-sync/pom.xml
# local/twitter-follow-graph/pom.xml
# local/twitter-history-elasticsearch/pom.xml
# local/twitter-userstream-elasticsearch/pom.xml
# pom.xml
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/e01a2e7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/e01a2e7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/e01a2e7f
Branch: refs/heads/master
Commit: e01a2e7f8429277c87cddc22c0ea5e486b9506fa
Parents: 5ddc67c 107852b
Author: Steve Blackmon @steveblackmon <sblackmon@apache.org>
Authored: Mon Apr 25 16:48:26 2016 -0500
Committer: Steve Blackmon @steveblackmon <sblackmon@apache.org>
Committed: Mon Apr 25 16:48:26 2016 -0500
----------------------------------------------------------------------
local/elasticsearch-hdfs/ElasticsearchHdfs.md | 47 ----
local/elasticsearch-hdfs/HdfsElasticsearch.md | 50 -----
local/elasticsearch-hdfs/README.md | 4 +-
local/elasticsearch-hdfs/pom.xml | 4 +-
.../src/site/markdown/ElasticsearchHdfs.md | 47 ++++
.../src/site/markdown/HdfsElasticsearch.md | 50 +++++
.../src/site/markdown/index.md | 35 +++
.../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 ++
local/elasticsearch-reindex/README.md | 4 +-
local/elasticsearch-reindex/pom.xml | 17 +-
.../src/site/markdown/index.md | 79 +++++++
.../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 +++
.../MongoElasticsearchSync.png | Bin 11502 -> 0 bytes
local/mongo-elasticsearch-sync/README.md | 4 +-
local/mongo-elasticsearch-sync/pom.xml | 4 +-
.../src/site/markdown/index.md | 68 ++++++
.../site/resources/MongoElasticsearchSync.dot | 18 ++
.../MongoElasticsearchSyncConfiguration.json | 10 +
.../src/site/resources/application.json | 17 ++
.../src/site/resources/testSync.json | 18 ++
local/twitter-follow-graph/README.md | 2 +-
.../twitter-follow-graph/TwitterFollowGraph.png | Bin 35826 -> 0 bytes
local/twitter-follow-graph/pom.xml | 15 +-
.../src/site/markdown/index.md | 97 ++++++++
.../src/site/resources/TwitterFollowGraph.dot | 21 ++
.../TwitterFollowGraphConfiguration.json | 13 ++
local/twitter-history-elasticsearch/README.md | 2 +-
.../TwitterHistoryElasticsearch.png | Bin 27497 -> 0 bytes
local/twitter-history-elasticsearch/pom.xml | 9 +-
.../src/site/markdown/index.md | 78 +++++++
.../resources/TwitterHistoryElasticsearch.dot | 21 ++
.../src/site/resources/application.conf | 23 ++
...witterHistoryElasticsearchConfiguration.json | 13 ++
.../twitter-userstream-elasticsearch/README.md | 4 +-
.../TwitterUserstreamElasticsearch.png | Bin 65713 -> 0 bytes
local/twitter-userstream-elasticsearch/pom.xml | 6 +-
.../src/site/markdown/index.md | 73 ++++++
.../TwitterUserstreamElasticsearch.dot | 28 +++
.../src/site/resources/application.conf | 22 ++
.../twitter/TwitterUserstreamElasticsearch.json | 14 ++
pom.xml | 224 ++++++++++++++++++-
src/site/markdown/index.md | 23 ++
src/site/site.xml | 29 +++
54 files changed, 1306 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/elasticsearch-hdfs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/elasticsearch-reindex/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/mongo-elasticsearch-sync/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/twitter-follow-graph/pom.xml
----------------------------------------------------------------------
diff --cc local/twitter-follow-graph/pom.xml
index a4129bc,db827e2..5fa4ab1
--- a/local/twitter-follow-graph/pom.xml
+++ b/local/twitter-follow-graph/pom.xml
@@@ -43,8 -42,11 +42,12 @@@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
+ <artifactId>streams-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/twitter-history-elasticsearch/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/local/twitter-userstream-elasticsearch/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c45556a,f9ec512..1e385b7
--- a/pom.xml
+++ b/pom.xml
@@@ -19,23 -19,149 +19,152 @@@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>streams-master</artifactId>
+ <groupId>org.apache.streams</groupId>
+ <version>0.3-incubating-SNAPSHOT</version>
- <relativePath>incubator-streams-master-pom.xml</relativePath>
- </parent>
++ </parent>
- <groupId>org.apache.streams</groupId>
<artifactId>streams-examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>streams-examples</name>
<description>Contributed examples of use cases for Streams.</description>
+ <url>http://streams.incubator.apache.org/site/${project.version}/streams-examples</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:git@github.com:apache/incubator-streams-examples.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-streams-examples.git</developerConnection>
+ <url>scm:git:git@github.com:apache/incubator-streams-examples.git</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>sblackmon</id>
+ <name>Steve Blackmon</name>
+ <email>sblackmon@apache.org</email>
+ <url>https://github.com/steveblackmon</url>
+ <organization>Apache Software Foundation</organization>
+ <organizationUrl>http://streams.incubator.apache.org</organizationUrl>
+ </developer>
+ </developers>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/STREAMS</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>jenkins</system>
+ <url>http://builds.apache.org/job/Streams%20Examples/</url>
+ </ciManagement>
+
+ <prerequisites>
+ <maven>3.0.5</maven>
+ </prerequisites>
+
+ <mailingLists>
+ <mailingList>
+ <name>Dev Mailing List</name>
+ <post>dev@streams.incubator.apache.org</post>
+ <subscribe>dev-subscribe@streams.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@streams.incubator.apache.org</unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>User Mailing List</name>
+ <post>user@streams.incubator.apache.org</post>
+ <subscribe>user-subscribe@streams.incubator.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@streams.incubator.apache.org</unsubscribe>
+ </mailingList>
+ </mailingLists>
+
+ <distributionManagement>
+ <site>
+ <id>streams.site.examples</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-examples/</url>
+ </site>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>central-repo</id>
+ <name>Maven Repository</name>
+ <!-- HTTPS is unavailable for Maven Central -->
+ <url>http://repo.maven.apache.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache-releases</id>
+ <name>Apache Repository</name>
+ <url>https://repository.apache.org/content/repositories/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>clojars-repo</id>
+ <name>Clojars Repository</name>
+ <url>http://clojars.org/repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>cloudera-repo</id>
+ <name>Cloudera Repository</name>
+ <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<properties>
- <streams.version>${project.version}</streams.version>
+ <!-- Release Properties -->
+ <snapshot.repository.url>
+ https://repository.apache.org/content/repositories/snapshots
+ </snapshot.repository.url>
+ <release.repository.url>
+ https://repository.apache.org/service/local/staging/deploy/maven2
+ </release.repository.url>
+
</properties>
<modules>
@@@ -62,14 -182,103 +191,103 @@@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
+ <artifactId>streams-filters</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
<artifactId>streams-pojo</artifactId>
- <version>${streams.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
+ <artifactId>streams-pojo</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-util</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-util</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
<artifactId>streams-pojo-extensions</artifactId>
- <version>${streams.version}</version>
+ <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-runtime-local</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-provider-twitter</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-persist-elasticsearch</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-persist-graph</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-persist-hdfs</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-persist-mongo</artifactId>
- <version>${streams.version}</version>
++ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-scm</artifactId>
+ <version>2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svn-commons</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/e01a2e7f/src/site/markdown/index.md
----------------------------------------------------------------------
diff --cc src/site/markdown/index.md
index 0000000,0000000..ac037b5
new file mode 100644
--- /dev/null
+++ b/src/site/markdown/index.md
@@@ -1,0 -1,0 +1,23 @@@
++Streams Examples
++================
++This repository contains 'ready-to-run' community-supported example applications built on
Apache Streams (incubating).
++
++These examples demonstrate some ways you can use various streams components and runtimes,
and patterns for testing and documenting your organization's streams.
++
++Note
++====
++
++The Streams Examples project itself (this one) depends on the separate Streams project,
which contains the source code and poms for Apache Streams.
++
++Releases of streams-project are published to the Apache Releases repository, so there is
typically no need to check it out manually and build it locally yourself.
++
++However, you may want to work from a SNAPSHOT branch and/or alter the versions of dependency
libraries, please refer to the Tutorial steps at http://streams.incubator.apache.org to build
streams-project and streams-examples.
++
++[Modules](modules.html "Modules")
++
++Release Notes
++=============
++
++[CHANGELOG.md](CHANGELOG.md "CHANGELOG.md")
++
++###### Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
|