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/09/04 01:03:57 UTC
[1/6] incubator-apex-malhar git commit: get ready for v3.0.1
Repository: incubator-apex-malhar
Updated Branches:
refs/heads/release-3.0 c32c97c53 -> 6f0739e4d
get ready for v3.0.1
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/f8facf9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/f8facf9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/f8facf9e
Branch: refs/heads/release-3.0
Commit: f8facf9e6dab22230ec9f8531204f76f03722820
Parents: c32c97c
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 3 14:01:36 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 3 14:01:36 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 4 ++--
apps/pom.xml | 2 +-
contrib/pom.xml | 2 +-
demos/echoserver/pom.xml | 4 ++--
demos/frauddetect/pom.xml | 4 ++--
demos/machinedata/pom.xml | 4 ++--
demos/mobile/pom.xml | 4 ++--
demos/mrmonitor/pom.xml | 4 ++--
demos/mroperator/pom.xml | 4 ++--
demos/pi/pom.xml | 4 ++--
demos/pom.xml | 2 +-
demos/r/pom.xml | 4 ++--
demos/twitter/pom.xml | 4 ++--
demos/uniquecount/pom.xml | 4 ++--
demos/wordcount/pom.xml | 4 ++--
demos/yahoofinance/pom.xml | 4 ++--
library/pom.xml | 2 +-
pom.xml | 2 +-
samples/pom.xml | 2 +-
19 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index bb52554..9c8a635 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-apps</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>logstream</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 065a9cc..ea0e448 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>malhar-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index bb48f5d..595d456 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>malhar-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/echoserver/pom.xml
----------------------------------------------------------------------
diff --git a/demos/echoserver/pom.xml b/demos/echoserver/pom.xml
index a2ae056..b6ea261 100644
--- a/demos/echoserver/pom.xml
+++ b/demos/echoserver/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>malhar-demos</artifactId>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>echoserver</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/frauddetect/pom.xml
----------------------------------------------------------------------
diff --git a/demos/frauddetect/pom.xml b/demos/frauddetect/pom.xml
index 29be702..ea8f9de 100644
--- a/demos/frauddetect/pom.xml
+++ b/demos/frauddetect/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>frauddetect-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/machinedata/pom.xml
----------------------------------------------------------------------
diff --git a/demos/machinedata/pom.xml b/demos/machinedata/pom.xml
index f46ba0e..3b0868e 100644
--- a/demos/machinedata/pom.xml
+++ b/demos/machinedata/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>machinedata-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/mobile/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mobile/pom.xml b/demos/mobile/pom.xml
index 039b29d..0b9d4cb 100644
--- a/demos/mobile/pom.xml
+++ b/demos/mobile/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>mobile-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/mrmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mrmonitor/pom.xml b/demos/mrmonitor/pom.xml
index cdf6543..90cfd7d 100644
--- a/demos/mrmonitor/pom.xml
+++ b/demos/mrmonitor/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>mrmonitor</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/mroperator/pom.xml
----------------------------------------------------------------------
diff --git a/demos/mroperator/pom.xml b/demos/mroperator/pom.xml
index b4fbfda..afd4ad3 100644
--- a/demos/mroperator/pom.xml
+++ b/demos/mroperator/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>mroperator</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/pi/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pi/pom.xml b/demos/pi/pom.xml
index 8a81970..7af3b6e 100644
--- a/demos/pi/pom.xml
+++ b/demos/pi/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>pi-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 0601366..07e9101 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>malhar-demos</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/r/pom.xml
----------------------------------------------------------------------
diff --git a/demos/r/pom.xml b/demos/r/pom.xml
index 8832de8..ea5b666 100644
--- a/demos/r/pom.xml
+++ b/demos/r/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>r-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/twitter/pom.xml
----------------------------------------------------------------------
diff --git a/demos/twitter/pom.xml b/demos/twitter/pom.xml
index d4afef9..d4bd2fc 100644
--- a/demos/twitter/pom.xml
+++ b/demos/twitter/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>twitter-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/uniquecount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/uniquecount/pom.xml b/demos/uniquecount/pom.xml
index 3d8b554..ea6c8f2 100644
--- a/demos/uniquecount/pom.xml
+++ b/demos/uniquecount/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>uniquecount</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/wordcount/pom.xml
----------------------------------------------------------------------
diff --git a/demos/wordcount/pom.xml b/demos/wordcount/pom.xml
index 5a956c5..d89305a 100644
--- a/demos/wordcount/pom.xml
+++ b/demos/wordcount/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>wordcount-demo</artifactId>
<packaging>jar</packaging>
@@ -14,7 +14,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/demos/yahoofinance/pom.xml
----------------------------------------------------------------------
diff --git a/demos/yahoofinance/pom.xml b/demos/yahoofinance/pom.xml
index 47ebf8a..ba723b8 100644
--- a/demos/yahoofinance/pom.xml
+++ b/demos/yahoofinance/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.datatorrent</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<artifactId>yahoo-finance-demo</artifactId>
<packaging>jar</packaging>
@@ -13,7 +13,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar-demos</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/library/pom.xml
----------------------------------------------------------------------
diff --git a/library/pom.xml b/library/pom.xml
index a07e072..58d1784 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>malhar-library</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffd5cc6..50103d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Malhar Open Source</name>
<url>https://www.datatorrent.com/</url>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/f8facf9e/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 10a623b..dd97a74 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>malhar</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>malhar-samples</artifactId>
[4/6] incubator-apex-malhar git commit: enable server plugin
Posted by th...@apache.org.
enable server plugin
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/eb674679
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/eb674679
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/eb674679
Branch: refs/heads/release-3.0
Commit: eb674679368b91e0adac12c5bd81af3dc913f4d0
Parents: f8facf9
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 10 11:53:27 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 10 11:53:27 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 1 +
demos/pom.xml | 1 +
pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/eb674679/apps/logstream/pom.xml
----------------------------------------------------------------------
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 9c8a635..b0c2ee0 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -15,6 +15,7 @@
<properties>
<maven.deploy.skip>false</maven.deploy.skip>
<skipTests>false</skipTests>
+ <semver.plugin.skip>true</semver.plugin.skip>
</properties>
<name>Logstream Application</name>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/eb674679/demos/pom.xml
----------------------------------------------------------------------
diff --git a/demos/pom.xml b/demos/pom.xml
index 07e9101..c963c97 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -30,6 +30,7 @@
<properties>
<datatorrent.version>3.0.0</datatorrent.version>
<datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath>
+ <semver.plugin.skip>true</semver.plugin.skip>
</properties>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/eb674679/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 50103d8..821bf3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,60 @@
<jackson.version>1.9.2</jackson.version>
<jersey.version>1.9</jersey.version>
<jetty.version>8.1.10.v20130312</jetty.version>
+ <semver.plugin.skip>false</semver.plugin.skip>
</properties>
+ <profiles>
+ <profile>
+ <activation>
+ <file>
+ <exists>src</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.5.1</version>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <file>
+ <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+ </file>
+ </newVersion>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <accessModifier>protected</accessModifier>
+ <breakBuildOnModifications>true</breakBuildOnModifications>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+ <includeSynthetic>false</includeSynthetic>
+ <ignoreMissingClasses>true</ignoreMissingClasses>
+ </parameter>
+ <skip>${semver.plugin.skip}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<modules>
<module>library</module>
<module>contrib</module>
[2/6] incubator-apex-malhar git commit: omitting type from FieldInfo
Posted by th...@apache.org.
omitting type from FieldInfo
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/0aeeefe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0aeeefe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0aeeefe9
Branch: refs/heads/release-3.0
Commit: 0aeeefe9f802634449ac588a43ef9aadb6e9005e
Parents: f8facf9
Author: Chandni Singh <ch...@datatorrent.com>
Authored: Fri Aug 7 14:54:25 2015 -0700
Committer: Chandni Singh <ch...@datatorrent.com>
Committed: Fri Aug 7 16:28:26 2015 -0700
----------------------------------------------------------------------
library/src/main/java/com/datatorrent/lib/util/FieldInfo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/0aeeefe9/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
index a4e4923..5b41ace 100644
--- a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
+++ b/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
@@ -100,6 +100,7 @@ public class FieldInfo
/**
* the Java type of the column
+ * @omitFromUI
*/
public void setType(SupportType type)
{
[3/6] incubator-apex-malhar git commit: Merge pull request #1530 from
chandnisingh/feature-bugs
Posted by th...@apache.org.
Merge pull request #1530 from chandnisingh/feature-bugs
omitting type from FieldInfo in App Builder
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/2af4bca9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/2af4bca9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/2af4bca9
Branch: refs/heads/release-3.0
Commit: 2af4bca93b72ad0e22fd877e53a355532708a3de
Parents: f8facf9 0aeeefe
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Fri Aug 7 16:40:27 2015 -0700
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Fri Aug 7 16:40:27 2015 -0700
----------------------------------------------------------------------
library/src/main/java/com/datatorrent/lib/util/FieldInfo.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[5/6] incubator-apex-malhar git commit: Merge pull request #1532 from
243826/semantic-versioning-patch
Posted by th...@apache.org.
Merge pull request #1532 from 243826/semantic-versioning-patch
enable server plugin
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/89b68c5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/89b68c5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/89b68c5a
Branch: refs/heads/release-3.0
Commit: 89b68c5a87559ddc2e64020cde7231adc7c578bf
Parents: 2af4bca eb67467
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 17 17:41:55 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 17 17:41:55 2015 -0700
----------------------------------------------------------------------
apps/logstream/pom.xml | 1 +
demos/pom.xml | 1 +
pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
----------------------------------------------------------------------
[6/6] incubator-apex-malhar git commit: MLHR-1835 #resolve The
AsyncHttpClient and WebSocket were not being closed on reconnect.
Posted by th...@apache.org.
MLHR-1835 #resolve The AsyncHttpClient and WebSocket were not being closed on reconnect.
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/6f0739e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/6f0739e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/6f0739e4
Branch: refs/heads/release-3.0
Commit: 6f0739e4d5f8aa73d4440da7cf604cadd849268d
Parents: 89b68c5
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Wed Sep 2 17:11:53 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Thu Sep 3 10:41:04 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/lib/io/WebSocketInputOperator.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6f0739e4/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
index dabcacb..e38d874 100644
--- a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
@@ -153,6 +153,7 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
try {
sleep(1000);
if (connectionClosed && !WebSocketInputOperator.this.shutdown) {
+ connection.close();
WebSocketInputOperator.this.activate(null);
}
}
@@ -183,6 +184,11 @@ public class WebSocketInputOperator<T> extends SimpleSinglePortInputOperator<T>
}
}));
+
+ if (client != null) {
+ client.closeAsynchronously();
+ }
+
client = new AsyncHttpClient(config);
connection = client.prepareGet(uri.toString()).execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketTextListener()
{